Page MenuHomeClusterLabs Projects
Files F4639278

No OneTemporary
Actions

View Options

diff --git a/crm/pengine/regression.core.sh b/crm/pengine/regression.core.sh
index 712898902f..14dc2f0ffa 100755
--- a/crm/pengine/regression.core.sh
+++ b/crm/pengine/regression.core.sh
@@ -1,179 +1,184 @@
#!/bin/bash
# Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This software is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
verbose=$1
io_dir=testcases
diff_opts="--ignore-all-space -U 1 -u"
failed=.regression.failed
# zero out the error log
> $failed
+num_failed=0
+
function do_test {
base=$1;
name=$2;
input=$io_dir/${base}.xml
output=$io_dir/${base}.pe.out
expected=$io_dir/${base}.exp
te_output=$io_dir/${base}.te.out
te_expected=$io_dir/${base}.te.exp
dot_output=$io_dir/${base}.pe.dot
dot_expected=$io_dir/${base}.dot
dot_png=$io_dir/${base}.png
if [ ! -f $input ]; then
echo "Test $name ($base)... Error (PE : input)";
return;
fi
if [ "$create_mode" != "true" -a ! -f $expected ]; then
echo "Test $name ($base)... Error (PE : expected)";
# return;
fi
+# ../admin/crm_verify -X $input
./ptest -V -X $input -D $dot_output > $output
if [ -s core ]; then
echo "Test $name ($base)... Moved core to core.${base}";
rm -f core.$base
mv core core.$base
return;
fi
if [ ! -s $output ]; then
echo "Test $name ($base)... Error (PE : raw output)";
rm $output
return;
fi
if [ ! -s $dot_output ]; then
echo "Test $name ($base)... Error (PE : dot output)";
rm $output
return;
fi
if [ ! -s $output ]; then
echo "Test $name ($base)... Error (PE : fixed output)";
rm $output
return;
fi
if [ "$create_mode" = "true" ]; then
cp "$output" "$expected"
cp "$dot_output" "$dot_expected"
fi
rc=2
dot -Tpng $dot_output 2>/dev/null > $dot_png
if [ -f $dot_expected ]; then
diff $diff_opts -q $dot_expected $dot_output >/dev/null
rc=$?
if [ $rc != 0 ]; then
echo "Test $name ($base)... * Failed (PE : dot)";
diff $diff_opts $dot_expected $dot_output 2>/dev/null >> $failed
+ num_failed=`expr $num_failed + 1`
else
rm $dot_output
fi
else
echo "Test $name ($base)... * No expected dot output";
echo "==== Raw results for PE test ($base) ====" >> $failed
cat $dot_output 2>/dev/null >> $failed
rm $dot_output
fi
rc2=2
if [ -f $expected ]; then
diff $diff_opts -q $expected $output >/dev/null
rc2=$?
if [ $rc2 != 0 ]; then
echo "Test $name ($base)... * Failed (PE : raw)";
diff $diff_opts $expected $output 2>/dev/null >> $failed
+ num_failed=`expr $num_failed + 1`
else
rm $output
fi
else
echo "Test $name ($base)... * No expected raw output";
echo "==== Raw results for PE test ($base) ====" >> $failed
cat $output 2>/dev/null >> $failed
rm $output
fi
if [ "$create_mode" = "true" ]; then
echo "Test $name ($base)... Created expected output (PE)"
elif [ "$rc" = 0 -a "$rc2" = 0 ]; then
echo "Test $name ($base)... Passed (PE)";
fi
if [ "$test_te" = "true" ]; then
../tengine/ttest -X $output 2> $te_output
# if [ "$create_mode" = "true" ]; then
if [ "$create_mode" = "true" -a ! -f $te_expected ]; then
cp "$te_output" "$te_expected"
fi
if [ -f $te_expected ]; then
diff $diff_opts -q $te_expected $te_output >/dev/null
rc=$?
fi
if [ "$create_mode" = "true" ]; then
echo "Test $name ($base)... Created expected output (PE)"
elif [ ! -f $te_expected ]; then
echo "==== Raw results for TE test ($base) ====" >> $failed
cat $te_output 2>/dev/null >> $failed
elif [ "$rc" = 0 ]; then
echo "Test $name ($base)... Passed (TE)";
elif [ "$rc" = 1 ]; then
echo "Test $name ($base)... * Failed (TE)";
diff $diff_opts $te_expected $te_output 2>/dev/null >> $failed
diff $diff_opts $te_expected $te_output
else
echo "Test $name ($base)... Error TE (diff: $rc)";
echo "==== Raw results for test ($base) TE ====" >> $failed
cat $te_output 2>/dev/null >> $failed
fi
fi
rm -f $output $te_output
}
#function do_test {
# base=$1;
# input=$io_dir/${base}.xml
# expected=$io_dir/${base}.exp
# te_expected=$io_dir/${base}.te.exp
# mv $input $expected $te_expected testcases.saved
#}
function test_results {
if [ -s $failed ]; then
if [ "$verbose" = "-v" ]; then
- echo "Results of failed tests...."
+ echo "Results of $num_failed failed tests...."
less $failed
else
- echo "Results of failed tests are in $failed...."
+ echo "Results of $num_failed failed tests are in $failed...."
echo "Use $0 -v to display them automatically."
fi
else
rm $failed
fi
}

File Metadata

Mime Type
text/x-diff
Expires
Thu, Jul 10, 2:35 AM (1 d, 15 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2009749
Default Alt Text
(5 KB)

Event Timeline