tests: factorize some sav in sav/nitg-common

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/tests/sav/nitg-e/fixme/base_attr_init_val_int_alt1.res b/tests/sav/nitg-common/fixme/base_attr_init_val_int_alt1.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_init_val_int_alt1.res
rename to tests/sav/nitg-common/fixme/base_attr_init_val_int_alt1.res

diff --git a/tests/sav/nitg-e/fixme/base_attr_init_val_int_alt2.res b/tests/sav/nitg-common/fixme/base_attr_init_val_int_alt2.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_init_val_int_alt2.res
rename to tests/sav/nitg-common/fixme/base_attr_init_val_int_alt2.res

diff --git a/tests/sav/nitg-e/fixme/base_attr_init_val_int_alt3.res b/tests/sav/nitg-common/fixme/base_attr_init_val_int_alt3.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_init_val_int_alt3.res
rename to tests/sav/nitg-common/fixme/base_attr_init_val_int_alt3.res

diff --git a/tests/sav/nitg-e/fixme/base_attr_init_val_int_alt4.res b/tests/sav/nitg-common/fixme/base_attr_init_val_int_alt4.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_init_val_int_alt4.res
rename to tests/sav/nitg-common/fixme/base_attr_init_val_int_alt4.res

diff --git a/tests/sav/nitg-e/fixme/base_attr_init_val_raf_alt1.res b/tests/sav/nitg-common/fixme/base_attr_init_val_raf_alt1.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_init_val_raf_alt1.res
rename to tests/sav/nitg-common/fixme/base_attr_init_val_raf_alt1.res

diff --git a/tests/sav/nitg-e/fixme/base_attr_nullable_int_alt1.res b/tests/sav/nitg-common/fixme/base_attr_nullable_int_alt1.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_nullable_int_alt1.res
rename to tests/sav/nitg-common/fixme/base_attr_nullable_int_alt1.res

diff --git a/tests/sav/nitg-e/fixme/base_attr_nullable_int_alt2.res b/tests/sav/nitg-common/fixme/base_attr_nullable_int_alt2.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_nullable_int_alt2.res
rename to tests/sav/nitg-common/fixme/base_attr_nullable_int_alt2.res

diff --git a/tests/sav/nitg-e/fixme/base_attr_nullable_int_alt3.res b/tests/sav/nitg-common/fixme/base_attr_nullable_int_alt3.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_nullable_int_alt3.res
rename to tests/sav/nitg-common/fixme/base_attr_nullable_int_alt3.res

diff --git a/tests/sav/nitg-e/fixme/base_attr_nullable_int_alt4.res b/tests/sav/nitg-common/fixme/base_attr_nullable_int_alt4.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_nullable_int_alt4.res
rename to tests/sav/nitg-common/fixme/base_attr_nullable_int_alt4.res

diff --git a/tests/sav/nitg-e/fixme/base_attr_nullable_int_alt5.res b/tests/sav/nitg-common/fixme/base_attr_nullable_int_alt5.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_attr_nullable_int_alt5.res
rename to tests/sav/nitg-common/fixme/base_attr_nullable_int_alt5.res

diff --git a/tests/sav/nitg-e/fixme/base_covar_int2_alt3.res b/tests/sav/nitg-common/fixme/base_covar_int2_alt3.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_covar_int2_alt3.res
rename to tests/sav/nitg-common/fixme/base_covar_int2_alt3.res

diff --git a/tests/sav/nitg-e/fixme/base_covar_int2_alt5.res b/tests/sav/nitg-common/fixme/base_covar_int2_alt5.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_covar_int2_alt5.res
rename to tests/sav/nitg-common/fixme/base_covar_int2_alt5.res

diff --git a/tests/sav/nitg-e/fixme/base_covar_int_alt3.res b/tests/sav/nitg-common/fixme/base_covar_int_alt3.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_covar_int_alt3.res
rename to tests/sav/nitg-common/fixme/base_covar_int_alt3.res

diff --git a/tests/sav/nitg-e/fixme/base_for_finish.res b/tests/sav/nitg-common/fixme/base_for_finish.res
similarity index 100%
rename from tests/sav/nitg-e/fixme/base_for_finish.res
rename to tests/sav/nitg-common/fixme/base_for_finish.res

diff --git a/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt1.res b/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt1.res
deleted file mode 100644 (file)
index c508d53..0000000
--- a/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt1.res
+++ /dev/null
@@ -1 +0,0 @@
-false

diff --git a/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt2.res b/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt2.res
deleted file mode 100644 (file)
index f76dd23..0000000
Binary files a/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt2.res and /dev/null differ

diff --git a/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt3.res b/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt3.res
deleted file mode 100644 (file)
index 573541a..0000000
--- a/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt3.res
+++ /dev/null
@@ -1 +0,0 @@
-0

diff --git a/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt4.res b/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt4.res
deleted file mode 100644 (file)
index 945da8f..0000000
--- a/tests/sav/nitg-g/fixme/base_attr_init_val_int_alt4.res
+++ /dev/null
@@ -1 +0,0 @@
-0.000000

diff --git a/tests/sav/nitg-g/fixme/base_attr_init_val_raf_alt1.res b/tests/sav/nitg-g/fixme/base_attr_init_val_raf_alt1.res
deleted file mode 100644 (file)
index 2f1465d..0000000
--- a/tests/sav/nitg-g/fixme/base_attr_init_val_raf_alt1.res
+++ /dev/null
@@ -1,3 +0,0 @@
-1
-1
-0

diff --git a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt1.res b/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt1.res
deleted file mode 100644 (file)
index 5625f1f..0000000
--- a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt1.res
+++ /dev/null
@@ -1,7 +0,0 @@
-0
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt2.res b/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt2.res
deleted file mode 100644 (file)
index 2e8046c..0000000
--- a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt2.res
+++ /dev/null
@@ -1,7 +0,0 @@
-1
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt3.res b/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt3.res
deleted file mode 100644 (file)
index f0c5f8f..0000000
--- a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt3.res
+++ /dev/null
@@ -1,8 +0,0 @@
-0
-0
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt4.res b/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt4.res
deleted file mode 100644 (file)
index a12c8e0..0000000
--- a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt4.res
+++ /dev/null
@@ -1,7 +0,0 @@
-10
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt5.res b/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt5.res
deleted file mode 100644 (file)
index f343f0e..0000000
--- a/tests/sav/nitg-g/fixme/base_attr_nullable_int_alt5.res
+++ /dev/null
@@ -1,8 +0,0 @@
-10
-20
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-g/fixme/base_covar_int2_alt3.res b/tests/sav/nitg-g/fixme/base_covar_int2_alt3.res
deleted file mode 100644 (file)
index fbffc32..0000000
--- a/tests/sav/nitg-g/fixme/base_covar_int2_alt3.res
+++ /dev/null
@@ -1,4 +0,0 @@
-1
-1
-1
-aa

diff --git a/tests/sav/nitg-g/fixme/base_covar_int2_alt5.res b/tests/sav/nitg-g/fixme/base_covar_int2_alt5.res
deleted file mode 100644 (file)
index 5f6d34c..0000000
--- a/tests/sav/nitg-g/fixme/base_covar_int2_alt5.res
+++ /dev/null
@@ -1,5 +0,0 @@
-1
-1
-1
-1
-a

diff --git a/tests/sav/nitg-g/fixme/base_covar_int_alt3.res b/tests/sav/nitg-g/fixme/base_covar_int_alt3.res
deleted file mode 100644 (file)
index d3413ee..0000000
--- a/tests/sav/nitg-g/fixme/base_covar_int_alt3.res
+++ /dev/null
@@ -1,5 +0,0 @@
-true
-true
-true
-false
-true

diff --git a/tests/sav/nitg-g/fixme/base_for_finish.res b/tests/sav/nitg-g/fixme/base_for_finish.res
deleted file mode 100644 (file)
index 390c4e4..0000000
--- a/tests/sav/nitg-g/fixme/base_for_finish.res
+++ /dev/null
@@ -1,16 +0,0 @@
-1
-2
-3
-0
-
-1
-100
-2
-0
-
-1
-10
-20
-100
-2
-10

diff --git a/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt1.res b/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt1.res
deleted file mode 100644 (file)
index c508d53..0000000
--- a/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt1.res
+++ /dev/null
@@ -1 +0,0 @@
-false

diff --git a/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt2.res b/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt2.res
deleted file mode 100644 (file)
index f76dd23..0000000
Binary files a/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt2.res and /dev/null differ

diff --git a/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt3.res b/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt3.res
deleted file mode 100644 (file)
index 573541a..0000000
--- a/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt3.res
+++ /dev/null
@@ -1 +0,0 @@
-0

diff --git a/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt4.res b/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt4.res
deleted file mode 100644 (file)
index 945da8f..0000000
--- a/tests/sav/nitg-s/fixme/base_attr_init_val_int_alt4.res
+++ /dev/null
@@ -1 +0,0 @@
-0.000000

diff --git a/tests/sav/nitg-s/fixme/base_attr_init_val_raf_alt1.res b/tests/sav/nitg-s/fixme/base_attr_init_val_raf_alt1.res
deleted file mode 100644 (file)
index 2f1465d..0000000
--- a/tests/sav/nitg-s/fixme/base_attr_init_val_raf_alt1.res
+++ /dev/null
@@ -1,3 +0,0 @@
-1
-1
-0

diff --git a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt1.res b/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt1.res
deleted file mode 100644 (file)
index 5625f1f..0000000
--- a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt1.res
+++ /dev/null
@@ -1,7 +0,0 @@
-0
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt2.res b/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt2.res
deleted file mode 100644 (file)
index 2e8046c..0000000
--- a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt2.res
+++ /dev/null
@@ -1,7 +0,0 @@
-1
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt3.res b/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt3.res
deleted file mode 100644 (file)
index f0c5f8f..0000000
--- a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt3.res
+++ /dev/null
@@ -1,8 +0,0 @@
-0
-0
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt4.res b/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt4.res
deleted file mode 100644 (file)
index a12c8e0..0000000
--- a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt4.res
+++ /dev/null
@@ -1,7 +0,0 @@
-10
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt5.res b/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt5.res
deleted file mode 100644 (file)
index f343f0e..0000000
--- a/tests/sav/nitg-s/fixme/base_attr_nullable_int_alt5.res
+++ /dev/null
@@ -1,8 +0,0 @@
-10
-20
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-s/fixme/base_covar_int2_alt3.res b/tests/sav/nitg-s/fixme/base_covar_int2_alt3.res
deleted file mode 100644 (file)
index fbffc32..0000000
--- a/tests/sav/nitg-s/fixme/base_covar_int2_alt3.res
+++ /dev/null
@@ -1,4 +0,0 @@
-1
-1
-1
-aa

diff --git a/tests/sav/nitg-s/fixme/base_covar_int2_alt5.res b/tests/sav/nitg-s/fixme/base_covar_int2_alt5.res
deleted file mode 100644 (file)
index 5f6d34c..0000000
--- a/tests/sav/nitg-s/fixme/base_covar_int2_alt5.res
+++ /dev/null
@@ -1,5 +0,0 @@
-1
-1
-1
-1
-a

diff --git a/tests/sav/nitg-s/fixme/base_covar_int_alt3.res b/tests/sav/nitg-s/fixme/base_covar_int_alt3.res
deleted file mode 100644 (file)
index d3413ee..0000000
--- a/tests/sav/nitg-s/fixme/base_covar_int_alt3.res
+++ /dev/null
@@ -1,5 +0,0 @@
-true
-true
-true
-false
-true

diff --git a/tests/sav/nitg-s/fixme/base_for_finish.res b/tests/sav/nitg-s/fixme/base_for_finish.res
deleted file mode 100644 (file)
index 390c4e4..0000000
--- a/tests/sav/nitg-s/fixme/base_for_finish.res
+++ /dev/null
@@ -1,16 +0,0 @@
-1
-2
-3
-0
-
-1
-100
-2
-0
-
-1
-10
-20
-100
-2
-10

diff --git a/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt1.res b/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt1.res
deleted file mode 100644 (file)
index c508d53..0000000
--- a/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt1.res
+++ /dev/null
@@ -1 +0,0 @@
-false

diff --git a/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt2.res b/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt2.res
deleted file mode 100644 (file)
index f76dd23..0000000
Binary files a/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt2.res and /dev/null differ

diff --git a/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt3.res b/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt3.res
deleted file mode 100644 (file)
index 573541a..0000000
--- a/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt3.res
+++ /dev/null
@@ -1 +0,0 @@
-0

diff --git a/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt4.res b/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt4.res
deleted file mode 100644 (file)
index 945da8f..0000000
--- a/tests/sav/nitg-sg/fixme/base_attr_init_val_int_alt4.res
+++ /dev/null
@@ -1 +0,0 @@
-0.000000

diff --git a/tests/sav/nitg-sg/fixme/base_attr_init_val_raf_alt1.res b/tests/sav/nitg-sg/fixme/base_attr_init_val_raf_alt1.res
deleted file mode 100644 (file)
index 2f1465d..0000000
--- a/tests/sav/nitg-sg/fixme/base_attr_init_val_raf_alt1.res
+++ /dev/null
@@ -1,3 +0,0 @@
-1
-1
-0

diff --git a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt1.res b/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt1.res
deleted file mode 100644 (file)
index 5625f1f..0000000
--- a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt1.res
+++ /dev/null
@@ -1,7 +0,0 @@
-0
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt2.res b/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt2.res
deleted file mode 100644 (file)
index 2e8046c..0000000
--- a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt2.res
+++ /dev/null
@@ -1,7 +0,0 @@
-1
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt3.res b/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt3.res
deleted file mode 100644 (file)
index f0c5f8f..0000000
--- a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt3.res
+++ /dev/null
@@ -1,8 +0,0 @@
-0
-0
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt4.res b/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt4.res
deleted file mode 100644 (file)
index a12c8e0..0000000
--- a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt4.res
+++ /dev/null
@@ -1,7 +0,0 @@
-10
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt5.res b/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt5.res
deleted file mode 100644 (file)
index f343f0e..0000000
--- a/tests/sav/nitg-sg/fixme/base_attr_nullable_int_alt5.res
+++ /dev/null
@@ -1,8 +0,0 @@
-10
-20
-0
-1
-2
-10
-20
-30

diff --git a/tests/sav/nitg-sg/fixme/base_covar_int2_alt3.res b/tests/sav/nitg-sg/fixme/base_covar_int2_alt3.res
deleted file mode 100644 (file)
index fbffc32..0000000
--- a/tests/sav/nitg-sg/fixme/base_covar_int2_alt3.res
+++ /dev/null
@@ -1,4 +0,0 @@
-1
-1
-1
-aa

diff --git a/tests/sav/nitg-sg/fixme/base_covar_int2_alt5.res b/tests/sav/nitg-sg/fixme/base_covar_int2_alt5.res
deleted file mode 100644 (file)
index 5f6d34c..0000000
--- a/tests/sav/nitg-sg/fixme/base_covar_int2_alt5.res
+++ /dev/null
@@ -1,5 +0,0 @@
-1
-1
-1
-1
-a

diff --git a/tests/sav/nitg-sg/fixme/base_covar_int_alt3.res b/tests/sav/nitg-sg/fixme/base_covar_int_alt3.res
deleted file mode 100644 (file)
index d3413ee..0000000
--- a/tests/sav/nitg-sg/fixme/base_covar_int_alt3.res
+++ /dev/null
@@ -1,5 +0,0 @@
-true
-true
-true
-false
-true

diff --git a/tests/sav/nitg-sg/fixme/base_for_finish.res b/tests/sav/nitg-sg/fixme/base_for_finish.res
deleted file mode 100644 (file)
index 390c4e4..0000000
--- a/tests/sav/nitg-sg/fixme/base_for_finish.res
+++ /dev/null
@@ -1,16 +0,0 @@
-1
-2
-3
-0
-
-1
-100
-2
-0
-
-1
-10
-20
-100
-2
-10

diff --git a/tests/tests.sh b/tests/tests.sh
index 76ecf2c..09eb300 100755 (executable)
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -373,22 +373,27 @@ case $engine in
                engine=nitg-s;
                enginebinname=nitg;
                OPT="--separate $OPT --compile-dir $compdir"
+               savdirs="sav/nitg-common/"
                ;;
        nitg-s)
                enginebinname=nitg;
                OPT="--separate $OPT --compile-dir $compdir"
+               savdirs="sav/nitg-common/"
                ;;
        nitg-e)
                enginebinname=nitg;
                OPT="--erasure $OPT --compile-dir $compdir"
+               savdirs="sav/nitg-common/"
                ;;
        nitg-sg)
                enginebinname=nitg;
                OPT="--semi-global $OPT --compile-dir $compdir"
+               savdirs="sav/nitg-common/"
                ;;
        nitg-g)
                enginebinname=nitg;
                OPT="--global $OPT --compile-dir $compdir"
+               savdirs="sav/nitg-common/"
                ;;
        nit)
                engine=niti