From 9a8745fcff718682a4d2f78de01353f7928d5998 Mon Sep 17 00:00:00 2001
From: Etienne Renault <renault@lrde.epita.fr>
Date: Tue, 19 May 2020 10:24:19 +0200
Subject: [PATCH] tests: ignore thread affinity

* tests/ltsmin/check.test,
tests/ltsmin/testconvert.test: Here.
---
 tests/ltsmin/check.test       | 17 ++++++++++-------
 tests/ltsmin/testconvert.test |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/tests/ltsmin/check.test b/tests/ltsmin/check.test
index e0ef93704..f0a0fd9c0 100755
--- a/tests/ltsmin/check.test
+++ b/tests/ltsmin/check.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 # -*- coding: utf-8 -*-
-# Copyright (C) 2011, 2012, 2014, 2015, 2016, 2017, 2019 Laboratoire
+# Copyright (C) 2011, 2012, 2014, 2015, 2016, 2017, 2019, 2020 Laboratoire
 # de Recherche et Développement de l'Epita (LRDE).
 #
 # This file is part of Spot, a model checking library.
@@ -82,26 +82,29 @@ grep 'Unexpected' stderr
 
 # Test Deadlock
 run 0 ../modelcheck --model $srcdir/beem-peterson.4.dve \
-    --csv --has-deadlock -p 1 >stdout
+    --csv --has-deadlock -p 1 | grep -v Thread > stdout
 test `grep "#" stdout | awk -F',' '{print $5}'` = "no_deadlock"
 
 # Test Bloemen
 run 0 ../modelcheck --model $srcdir/beem-peterson.4.dve \
-    --csv --bloemen -p 1 >stdout
+    --csv --bloemen -p 1 | grep -v Thread > stdout
 test `grep "#" stdout | awk -F',' '{print $8}'` -eq 29115
 
 # Test Bloemen
 run 0 ../modelcheck --model $srcdir/beem-peterson.4.dve \
-    --csv --bloemen -p 3 >stdout
+    --csv --bloemen -p 3 | grep -v Thread > stdout
 test `grep "#" stdout | awk -F',' '{print $8}'` -eq 29115
 
 run 0 ../modelcheck --model $srcdir/beem-peterson.4.dve \
-    --formula '!GF(P_0.CS|P_1.CS|P_2.CS|P_3.CS)' --csv --bloemen-ec -p 3 >stdout
+    --formula '!GF(P_0.CS|P_1.CS|P_2.CS|P_3.CS)' --csv  \
+    --bloemen-ec -p 3 | grep -v Thread > stdout
 
 # Test CNDFS
 run 0 ../modelcheck --model $srcdir/beem-peterson.4.dve \
-    --formula '!GF(P_0.CS|P_1.CS|P_2.CS|P_3.CS)' --csv --cndfs -p 3 >stdout
+    --formula '!GF(P_0.CS|P_1.CS|P_2.CS|P_3.CS)' --csv  \
+    --cndfs -p 3 | grep -v Thread >stdout
 
 # Test SWARMING
 run 0 ../modelcheck --model $srcdir/beem-peterson.4.dve \
-    --formula '!GF(P_0.CS|P_1.CS|P_2.CS|P_3.CS)' --csv --swarming -p 3 >stdout
+    --formula '!GF(P_0.CS|P_1.CS|P_2.CS|P_3.CS)' --csv  \
+    --swarming -p 3 | grep -v Thread > stdout
diff --git a/tests/ltsmin/testconvert.test b/tests/ltsmin/testconvert.test
index 7e925782c..52ce1bc10 100644
--- a/tests/ltsmin/testconvert.test
+++ b/tests/ltsmin/testconvert.test
@@ -33,7 +33,7 @@ fi
 
 set -e
 
-run 0 ../testconvert $srcdir/finite.dve 'true' > output
+run 0 ../testconvert $srcdir/finite.dve 'true' | grep -v Thread > output
 cat << EOF > expected
 [CUBE] Model: 15,24
 [BDD]  Model: 15,24
@@ -43,7 +43,7 @@ EOF
 
 cmp output expected
 
-run 0 ../testconvert $srcdir/finite.dve 'G "P.a==5"' > output
+run 0 ../testconvert $srcdir/finite.dve 'G "P.a==5"'| grep -v Thread > output
 cat << EOF > expected
 [CUBE] Model: 15,24
 [BDD]  Model: 15,24