* src/tgbatest/explicit.test, src/tgbatest/explpro2.test,

src/tgbatest/explprod.test, src/tgbatest/tripprod.test,
src/evtgbatest/explicit.test: Do not reorder the output.
It's pointless since 2005-01-20.
This commit is contained in:
Alexandre Duret-Lutz 2005-01-31 17:24:42 +00:00
parent 885097ae62
commit 42cd2e05b5
6 changed files with 24 additions and 41 deletions

View file

@ -1,5 +1,5 @@
#!/bin/sh
# Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
# Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6),
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
# et Marie Curie.
#
@ -27,8 +27,6 @@ set -e
run 0 ./explicit > stdout
perl -pi -e 's/a3, a2/a2, a3/;' stdout
cat >expected <<\EOF
digraph G {
"*1" [label="", style=invis, height=0]

View file

@ -1,5 +1,5 @@
#!/bin/sh
# Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
# Copyright (C) 2003, 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6),
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
# et Marie Curie.
#
@ -27,8 +27,6 @@ set -e
run 0 ./explicit > stdout
perl -pi -e 's/c & b/b & c/g' stdout
cat >expected <<EOF
digraph G {
0 [label="", style=invis, height=0]

View file

@ -1,5 +1,5 @@
#!/bin/sh
# Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
# Copyright (C) 2003, 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6),
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
# et Marie Curie.
#
@ -38,19 +38,13 @@ s1, s3, "a", p3;
EOF
cat >expected <<EOF
acc = "p1" "p2" "p3";
"s1 * s1", "s2 * s2", "!a & b", "p1" "p2";
"s1 * s1", "s3 * s3", "a & !b", "p2" "p3";
acc = "p3" "p2" "p1";
"s1 * s1", "s2 * s2", "b & !a", "p2" "p1";
"s1 * s1", "s3 * s3", "a & !b", "p3" "p2";
EOF
run 0 ./explprod input1 input2 > stdout
# Sort out some possible inversions in the output.
# (The order is not guaranteed by SPOT.)
perl -pe 's/("\w+") ("\w+")(?: ("\w+"))?/@{[sort $1, $2, $3]}/g;
s/!b & a/a & !b/g;s/b & !a/!a & b/g' \
stdout > tmp_ && mv tmp_ stdout
cat stdout
diff stdout expected
rm input1 input2 stdout expected

View file

@ -1,5 +1,5 @@
#!/bin/sh
# Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
# Copyright (C) 2003, 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6),
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
# et Marie Curie.
#
@ -40,18 +40,13 @@ s2, s1, "a", p3;
EOF
cat >expected <<EOF
acc = "p1" "p2" "p3";
"s1 * s1", "s3 * s2", "a & b", "p1" "p2";
"s1 * s1", "s2 * s2", "b", "p1" "p2";
"s2 * s2", "s3 * s1", "a & c", "p1" "p3";
acc = "p3" "p2" "p1";
"s1 * s1", "s3 * s2", "a & b", "p2" "p1";
"s1 * s1", "s2 * s2", "b", "p2" "p1";
"s2 * s2", "s3 * s1", "a & c", "p3" "p1";
EOF
run 0 ./explprod input1 input2 > stdout
# Sort out some possible inversions in the output.
# (The order is not guaranteed by SPOT.)
perl -pe 's/("\w+") ("\w+")(?: ("\w+"))?/@{[sort $1, $2, $3]}/g;
s/c & a/a & c/g;s/b & a/a & b/g' \
stdout > tmp_ && mv tmp_ stdout
cat stdout
diff stdout expected

View file

@ -1,5 +1,5 @@
#!/bin/sh
# Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
# Copyright (C) 2003, 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6),
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
# et Marie Curie.
#
@ -48,24 +48,17 @@ s2, s3,, p4;
EOF
cat >expected <<EOF
acc = "p1" "p2" "p3" "p4";
"s1 * s1 * s1", "s3 * s2 * s2", "a & b", "p1" "p2";
"s1 * s1 * s1", "s2 * s2 * s2", "a & b", "p1" "p2";
"s1 * s1 * s1", "s3 * s2 * s3", "a & b", "p1" "p2";
"s1 * s1 * s1", "s2 * s2 * s3", "b", "p1" "p2";
"s2 * s2 * s2", "s3 * s1 * s3", "a & c", "p3" "p4";
"s2 * s2 * s3", "s3 * s1 * s2", "a & c", "p3" "p4";
acc = "p4" "p3" "p2" "p1";
"s1 * s1 * s1", "s3 * s2 * s2", "a & b", "p2" "p1";
"s1 * s1 * s1", "s2 * s2 * s2", "a & b", "p2" "p1";
"s1 * s1 * s1", "s3 * s2 * s3", "a & b", "p2" "p1";
"s1 * s1 * s1", "s2 * s2 * s3", "b", "p2" "p1";
"s2 * s2 * s2", "s3 * s1 * s3", "a & c", "p4" "p3";
"s2 * s2 * s3", "s3 * s1 * s2", "a & c", "p4" "p3";
EOF
run 0 ./tripprod input1 input2 input3 > stdout
# Sort out some possible inversions in the output.
# (The order is not guaranteed by SPOT.)
perl -pe 's/("\w+") ("\w+")(?: ("\w+"))?(?: ("\w+"))?/@{[sort $1,$2,$3,$4]}/g;
s/c & a/a & c/g;s/b & a/a & b/g' \
stdout > tmp_ &&
mv tmp_ stdout
cat stdout
diff stdout expected
rm input1 input2 input3 stdout expected