fix more tests

ocaml · Nov 28, 2024 · b36769f · b36769f
1 parent 2531f26
commit b36769f
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 21 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -60,6 +60,9 @@ jobs:
 
       - run: opam exec -- make test
 
+      - run: opam exec -- /bin/bash ./test/runtest.sh
+        shell: bash
+
       - run: OCAMLBUILD=$(pwd)/ocamlbuild.native opam exec -- make -C bootstrap
         shell: bash
 

diff --git a/test/runtest.sh b/test/runtest.sh
@@ -16,17 +16,7 @@ cd `dirname $0`
 
 export OCB=$PWD/../ocamlbuild.native
 
-myfiglet() {
-  figlet $@ | sed 's/  *$//'
-}
-
-if figlet ""; then
-  BANNER=myfiglet
-else
-  echo "Install figlet to have a better output, press enter to continue with echo"
-  read
-  BANNER=echo
-fi
+BANNER=echo
 
 HERE=`pwd`
 

diff --git a/test/test11/test.sh b/test/test11/test.sh
@@ -15,7 +15,7 @@ cd `dirname $0`
 set -e
 set -x
 CMDOTPS="" # -- command args
-BUILD="$OCB -I a -I b aa.byte aa.native -no-skip -classic-display $@"
+BUILD="$OCB -I a -I b aa.byte aa.native -classic-display $@"
 BUILD1="$BUILD $CMDOPTS"
 BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS"
 rm -rf _build

diff --git a/test/test2/_tags b/test/test2/_tags
@@ -11,5 +11,6 @@
 #########################################################################
 
 "vivi.ml": camlp4o
+true: package(camlp-streams)
 
 # , some_useless_tag, \ more_useless_tags
diff --git a/test/test2/test.sh b/test/test2/test.sh
@@ -14,8 +14,15 @@
 cd `dirname $0`
 set -e
 set -x
+if ocamlfind query camlp4 camlp-streams -qo; then
+    echo "camlp4 and camlp-streams are installed";
+else
+    echo "Missing dependencies: make sure camlp4 and camlp-streams are installed";
+    echo "SKIP";
+    exit 0;
+fi
 CMDOPTS="-- -help"
-BUILD="$OCB toto.byte toto.native -no-skip -classic-display $@"
+BUILD="$OCB toto.byte toto.native -use-ocamlfind -classic-display $@"
 BUILD1="$BUILD $CMDOPTS"
 BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS"
 rm -rf _build

diff --git a/test/test3/test.sh b/test/test3/test.sh
@@ -15,7 +15,7 @@ cd `dirname $0`
 set -e
 set -x
 CMDOTPS="" # -- command args
-BUILD="$OCB a.byte a.native proj.docdir/index.html -no-skip -classic-display $@"
+BUILD="$OCB a.byte a.native proj.docdir/index.html -classic-display $@"
 BUILD1="$BUILD $CMDOPTS"
 BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS"
 rm -rf _build

diff --git a/test/test4/test.sh b/test/test4/test.sh
@@ -15,7 +15,7 @@ cd `dirname $0`
 set -e
 set -x
 CMDOTPS="" # -- command args
-BUILD="$OCB -I a -I b aa.byte aa.native -no-skip -classic-display $@"
+BUILD="$OCB -I a -I b aa.byte aa.native -classic-display $@"
 BUILD1="$BUILD $CMDOPTS"
 BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS"
 rm -rf _build

diff --git a/test/test5/test.sh b/test/test5/test.sh
@@ -15,7 +15,7 @@ cd `dirname $0`
 set -e
 set -x
 CMDOPTS="" # -- command args
-BUILD="$OCB d.byte d.native -no-skip -classic-display $@"
+BUILD="$OCB d.byte d.native -classic-display $@"
 BUILD1="$BUILD $CMDOPTS"
 BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS"
 rm -rf _build

diff --git a/test/test6/test.sh b/test/test6/test.sh
@@ -15,7 +15,7 @@ cd `dirname $0`
 set -x
 rm -rf _build
 CMDOPTS="" # -- command args
-BUILD="$OCB -no-skip main.byte -classic-display $@"
+BUILD="$OCB main.byte -classic-display $@"
 BUILD1="$BUILD $CMDOPTS"
 BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS"
 cp b.mli.v1 b.mli

diff --git a/test/test7/test.sh b/test/test7/test.sh
@@ -15,7 +15,7 @@ cd `dirname $0`
 set -e
 set -x
 CMDOPTS="" # -- command args
-BUILD="$OCB bbcc.cma main.byte bbcc.cmxa main.native -no-skip -classic-display $@"
+BUILD="$OCB bbcc.cma main.byte bbcc.cmxa main.native -classic-display $@"
 BUILD1="$BUILD $CMDARGS"
 BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDARGS"
 rm -rf _build

diff --git a/test/test8/test.sh b/test/test8/test.sh
@@ -15,7 +15,7 @@ cd `dirname $0`
 set -e
 set -x
 CMDOPTS="" # -- command args
-BUILD="$OCB a.byte a.native a a.opt bin/a bin/a.opt -no-skip -classic-display $@"
+BUILD="$OCB a.byte a.native a a.opt bin/a bin/a.opt -classic-display $@"
 BUILD1="$BUILD $CMDOPTS"
 BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS"
 rm -rf _build

diff --git a/test/test9/test.sh b/test/test9/test.sh
@@ -14,6 +14,6 @@
 set -e
 set -x
 cd `dirname $0`/../..
-ocamlc -I src ocamlbuild_pack.cmo test/test9/testglob.ml -o ./testglob.native
+ocamlc -I src -I +unix unix.cma ocamlbuild_pack.cmo test/test9/testglob.ml -o ./testglob.native
 ./testglob.native
 rm testglob.native
diff --git a/test/test_virtual/test.sh b/test/test_virtual/test.sh
@@ -15,7 +15,7 @@ cd `dirname $0`
 set -e
 set -x
 CMDOPTS="" # -- command args
-BUILD="$OCB bar -no-skip -no-links -classic-display $@"
+BUILD="$OCB bar -no-links -classic-display $@"
 BUILD1="$BUILD $CMDOPTS"
 BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS"
 rm -rf _build