From 42cd2e05b5441f3f7fdb5e23c4f51569ab323771 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Mon, 31 Jan 2005 17:24:42 +0000
Subject: [PATCH] * 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.

---
 ChangeLog                    |  5 +++++
 src/evtgbatest/explicit.test |  4 +---
 src/tgbatest/explicit.test   |  4 +---
 src/tgbatest/explpro2.test   | 14 ++++----------
 src/tgbatest/explprod.test   | 15 +++++----------
 src/tgbatest/tripprod.test   | 23 ++++++++---------------
 6 files changed, 24 insertions(+), 41 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 474b24a38..b816b4781 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-01-31  Alexandre Duret-Lutz  <adl@src.lip6.fr>
 
+	* 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.
+
 	* configure.ac, NEWS: Bump version to 0.1a.
 
 	* configure.ac, NEWS: Bump version to 0.1.
diff --git a/src/evtgbatest/explicit.test b/src/evtgbatest/explicit.test
index 4bec875b6..7884e55c6 100755
--- a/src/evtgbatest/explicit.test
+++ b/src/evtgbatest/explicit.test
@@ -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]
diff --git a/src/tgbatest/explicit.test b/src/tgbatest/explicit.test
index 6e5fe9db0..bab2cbb88 100755
--- a/src/tgbatest/explicit.test
+++ b/src/tgbatest/explicit.test
@@ -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]
diff --git a/src/tgbatest/explpro2.test b/src/tgbatest/explpro2.test
index 43da4aac0..8545c5653 100755
--- a/src/tgbatest/explpro2.test
+++ b/src/tgbatest/explpro2.test
@@ -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
diff --git a/src/tgbatest/explprod.test b/src/tgbatest/explprod.test
index 5496e6021..85643af2f 100755
--- a/src/tgbatest/explprod.test
+++ b/src/tgbatest/explprod.test
@@ -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
diff --git a/src/tgbatest/tripprod.test b/src/tgbatest/tripprod.test
index 472ec731e..0f33831ff 100755
--- a/src/tgbatest/tripprod.test
+++ b/src/tgbatest/tripprod.test
@@ -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