coq-makefile: make test suite detect more errors

Replacing ; with && and enabling bash's pipefail option

19 files changed, 14 insertions, 65 deletions

diff --git a/test-suite/coq-makefile/arg/run.sh b/test-suite/coq-makefile/arg/run.sh
index e98da17c78..aa0f50001a 100755
--- a/test-suite/coq-makefile/arg/run.sh
+++ b/test-suite/coq-makefile/arg/run.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-#set -x
-set -e
-
 . ../template/init.sh
 
 coq_makefile -f _CoqProject -o Makefile
diff --git a/test-suite/coq-makefile/compat-subdirs/run.sh b/test-suite/coq-makefile/compat-subdirs/run.sh
index 28d9878f9b..211f73adc7 100755
--- a/test-suite/coq-makefile/compat-subdirs/run.sh
+++ b/test-suite/coq-makefile/compat-subdirs/run.sh
@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 
-#set -x
-set -e
-
 . ../template/init.sh
+
 coq_makefile -f _CoqProject -o Makefile
 make
 exec test -f "subdir/done"
diff --git a/test-suite/coq-makefile/coqdoc1/run.sh b/test-suite/coq-makefile/coqdoc1/run.sh
index e8291c89da..78e30bd354 100755
--- a/test-suite/coq-makefile/coqdoc1/run.sh
+++ b/test-suite/coq-makefile/coqdoc1/run.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-#set -x
-set -e
-
 . ../template/init.sh
 
 coq_makefile -f _CoqProject -o Makefile
@@ -11,7 +8,7 @@ make html mlihtml
 make install DSTROOT="$PWD/tmp"
 make install-doc DSTROOT="$PWD/tmp"
 #make debug
-(for d in `find tmp -name user-contrib`; do pushd $d >/dev/null; find .; popd >/dev/null; done) | sort -u > actual
+(for d in `find tmp -name user-contrib` ; do pushd $d >/dev/null && find . && popd >/dev/null; done) | sort -u > actual
 sort -u > desired <<EOT
 .
 ./test
diff --git a/test-suite/coq-makefile/coqdoc2/run.sh b/test-suite/coq-makefile/coqdoc2/run.sh
index e8291c89da..78e30bd354 100755
--- a/test-suite/coq-makefile/coqdoc2/run.sh
+++ b/test-suite/coq-makefile/coqdoc2/run.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-#set -x
-set -e
-
 . ../template/init.sh
 
 coq_makefile -f _CoqProject -o Makefile
@@ -11,7 +8,7 @@ make html mlihtml
 make install DSTROOT="$PWD/tmp"
 make install-doc DSTROOT="$PWD/tmp"
 #make debug
-(for d in `find tmp -name user-contrib`; do pushd $d >/dev/null; find .; popd >/dev/null; done) | sort -u > actual
+(for d in `find tmp -name user-contrib` ; do pushd $d >/dev/null && find . && popd >/dev/null; done) | sort -u > actual
 sort -u > desired <<EOT
 .
 ./test
diff --git a/test-suite/coq-makefile/extend-subdirs/run.sh b/test-suite/coq-makefile/extend-subdirs/run.sh
index ea5792a937..211f73adc7 100755
--- a/test-suite/coq-makefile/extend-subdirs/run.sh
+++ b/test-suite/coq-makefile/extend-subdirs/run.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-#set -x
-set -e
-
 . ../template/init.sh
 
 coq_makefile -f _CoqProject -o Makefile
diff --git a/test-suite/coq-makefile/latex1/run.sh b/test-suite/coq-makefile/latex1/run.sh
index 214a9d5b28..5337ca2952 100755
--- a/test-suite/coq-makefile/latex1/run.sh
+++ b/test-suite/coq-makefile/latex1/run.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-#set -x
-set -e
-
 if which pdflatex; then
 
 . ../template/init.sh
diff --git a/test-suite/coq-makefile/merlin1/run.sh b/test-suite/coq-makefile/merlin1/run.sh
index 752c0c2cea..37c5ab5c40 100755
--- a/test-suite/coq-makefile/merlin1/run.sh
+++ b/test-suite/coq-makefile/merlin1/run.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-#set -x
-set -e
-
 . ../template/init.sh
 
 coq_makefile -f _CoqProject -o Makefile
diff --git a/test-suite/coq-makefile/mlpack1/run.sh b/test-suite/coq-makefile/mlpack1/run.sh
index 10a200ddee..1ca69bf230 100755
--- a/test-suite/coq-makefile/mlpack1/run.sh
+++ b/test-suite/coq-makefile/mlpack1/run.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-#set -x
-set -e
-
 . ../template/init.sh
 
 coq_makefile -f _CoqProject -o Makefile
@@ -10,7 +7,7 @@ make
 make html mlihtml
 make install DSTROOT="$PWD/tmp"
 #make debug
-(cd `find tmp -name user-contrib`; find .) | sort > actual
+(cd `find tmp -name user-contrib` && find .) | sort > actual
 sort > desired <<EOT
 .
 ./test
diff --git a/test-suite/coq-makefile/mlpack2/run.sh b/test-suite/coq-makefile/mlpack2/run.sh
index 10a200ddee..1ca69bf230 100755
--- a/test-suite/coq-makefile/mlpack2/run.sh
+++ b/test-suite/coq-makefile/mlpack2/run.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-#set -x
-set -e
-
 . ../template/init.sh
 
 coq_makefile -f _CoqProject -o Makefile
@@ -10,7 +7,7 @@ make
 make html mlihtml
 make install DSTROOT="$PWD/tmp"
 #make debug
-(cd `find tmp -name user-contrib`; find .) | sort > actual
+(cd `find tmp -name user-contrib` && find .) | sort > actual
 sort > desired <<EOT
 .
 ./test
diff --git a/test-suite/coq-makefile/multiroot/run.sh b/test-suite/coq-makefile/multiroot/run.sh
index 3cd1ac305f..f23cf01495 100755
--- a/test-suite/coq-makefile/multiroot/run.sh
+++ b/test-suite/coq-makefile/multiroot/run.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-#set -x
-set -e
-
 . ../template/init.sh
 
 cp -r theories theories2
@@ -13,7 +10,7 @@ make html mlihtml
 make install DSTROOT="$PWD/tmp"
 make install-doc DSTROOT="$PWD/tmp"
 #make debug
-(for d in `find tmp -name user-contrib`; do pushd $d >/dev/null; find .; popd >/dev/null; done) | sort -u > actual
+(for d in `find tmp -name user-contrib` ; do pushd $d >/dev/null && find . && popd >/dev/null; done) | sort -u > actual
 sort > desired <<EOT
 .
 ./test
diff --git a/test-suite/coq-makefile/native1/run.sh b/test-suite/coq-makefile/native1/run.sh
index 9f6295d644..5a7b7694cc 100755
--- a/test-suite/coq-makefile/native1/run.sh
+++ b/test-suite/coq-makefile/native1/run.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-#set -x
-set -e
-
 NATIVECOMP=`grep "let no_native_compiler = false" ../../../config/coq_config.ml`||true
 if [[ `which ocamlopt` && $NATIVECOMP ]]; then
 
@@ -13,7 +10,7 @@ make
 make html mlihtml
 make install DSTROOT="$PWD/tmp"
 #make debug
-(cd `find tmp -name user-contrib`; find .) | sort > actual
+(cd `find tmp -name user-contrib` && find .) | sort > actual
 sort > desired <<EOT
 .
 ./test
diff --git a/test-suite/coq-makefile/only/run.sh b/test-suite/coq-makefile/only/run.sh
index 2ea3deffb7..859a4bd7ea 100755
--- a/test-suite/coq-makefile/only/run.sh
+++ b/test-suite/coq-makefile/only/run.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-#set -x
-set -e
-
 . ../template/init.sh
 
 coq_makefile -f _CoqProject -o Makefile
diff --git a/test-suite/coq-makefile/plugin1/run.sh b/test-suite/coq-makefile/plugin1/run.sh
index c2d47166fe..abe715542d 100755
--- a/test-suite/coq-makefile/plugin1/run.sh
+++ b/test-suite/coq-makefile/plugin1/run.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-#set -x
-set -e
-
 . ../template/init.sh
 
 mv src/test_plugin.mlpack src/test_plugin.mllib
@@ -11,7 +8,7 @@ make
 make html mlihtml
 make install DSTROOT="$PWD/tmp"
 #make debug
-(cd `find tmp -name user-contrib`; find .) | sort > actual
+(cd `find tmp -name user-contrib` && find .) | sort > actual
 sort > desired <<EOT
 .
 ./test
diff --git a/test-suite/coq-makefile/plugin2/run.sh b/test-suite/coq-makefile/plugin2/run.sh
index c2d47166fe..abe715542d 100755
--- a/test-suite/coq-makefile/plugin2/run.sh
+++ b/test-suite/coq-makefile/plugin2/run.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-#set -x
-set -e
-
 . ../template/init.sh
 
 mv src/test_plugin.mlpack src/test_plugin.mllib
@@ -11,7 +8,7 @@ make
 make html mlihtml
 make install DSTROOT="$PWD/tmp"
 #make debug
-(cd `find tmp -name user-contrib`; find .) | sort > actual
+(cd `find tmp -name user-contrib` && find .) | sort > actual
 sort > desired <<EOT
 .
 ./test
diff --git a/test-suite/coq-makefile/plugin3/run.sh b/test-suite/coq-makefile/plugin3/run.sh
index c2d47166fe..abe715542d 100755
--- a/test-suite/coq-makefile/plugin3/run.sh
+++ b/test-suite/coq-makefile/plugin3/run.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-#set -x
-set -e
-
 . ../template/init.sh
 
 mv src/test_plugin.mlpack src/test_plugin.mllib
@@ -11,7 +8,7 @@ make
 make html mlihtml
 make install DSTROOT="$PWD/tmp"
 #make debug
-(cd `find tmp -name user-contrib`; find .) | sort > actual
+(cd `find tmp -name user-contrib` && find .) | sort > actual
 sort > desired <<EOT
 .
 ./test
diff --git a/test-suite/coq-makefile/template/init.sh b/test-suite/coq-makefile/template/init.sh
index c952d41a30..803fe8029a 100755
--- a/test-suite/coq-makefile/template/init.sh
+++ b/test-suite/coq-makefile/template/init.sh
@@ -1,3 +1,5 @@
+set -e
+set -o pipefail
 
 export PATH=$COQBIN:$PATH
 
diff --git a/test-suite/coq-makefile/uninstall1/run.sh b/test-suite/coq-makefile/uninstall1/run.sh
index e525e12086..ef90f99934 100755
--- a/test-suite/coq-makefile/uninstall1/run.sh
+++ b/test-suite/coq-makefile/uninstall1/run.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-#set -x
-set -e
-
 . ../template/init.sh
 
 coq_makefile -f _CoqProject -o Makefile
@@ -13,7 +10,7 @@ make install-doc DSTROOT="$PWD/tmp"
 make uninstall DSTROOT="$PWD/tmp"
 make uninstall-doc DSTROOT="$PWD/tmp"
 #make debug
-(for d in `find tmp -name user-contrib`; do pushd $d >/dev/null; find .; popd >/dev/null; done) | sort -u > actual
+(for d in `find tmp -name user-contrib` ; do pushd $d >/dev/null && find . && popd >/dev/null; done) | sort -u > actual
 sort -u > desired <<EOT
 .
 EOT
diff --git a/test-suite/coq-makefile/uninstall2/run.sh b/test-suite/coq-makefile/uninstall2/run.sh
index e525e12086..ef90f99934 100755
--- a/test-suite/coq-makefile/uninstall2/run.sh
+++ b/test-suite/coq-makefile/uninstall2/run.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-#set -x
-set -e
-
 . ../template/init.sh
 
 coq_makefile -f _CoqProject -o Makefile
@@ -13,7 +10,7 @@ make install-doc DSTROOT="$PWD/tmp"
 make uninstall DSTROOT="$PWD/tmp"
 make uninstall-doc DSTROOT="$PWD/tmp"
 #make debug
-(for d in `find tmp -name user-contrib`; do pushd $d >/dev/null; find .; popd >/dev/null; done) | sort -u > actual
+(for d in `find tmp -name user-contrib` ; do pushd $d >/dev/null && find . && popd >/dev/null; done) | sort -u > actual
 sort -u > desired <<EOT
 .
 EOT
diff --git a/test-suite/coq-makefile/validate1/run.sh b/test-suite/coq-makefile/validate1/run.sh
index aaa4194b38..109acab85a 100755
--- a/test-suite/coq-makefile/validate1/run.sh
+++ b/test-suite/coq-makefile/validate1/run.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-#set -x
-set -e
-
 . ../template/init.sh
 
 coq_makefile -f _CoqProject -o Makefile