More test

.gitattributes

@@ -3,3 +3,4 @@
 
 # Quoted strings with newlines
 testsuite/internal.ml text eol=lf
+*.sh text eol=lf

.github/workflows/build.yml

@@ -68,9 +68,11 @@ jobs:
       - run: opam exec -- opam install -v ocamlbuild
       - run: opam exec -- opam install -v menhir
       - run: opam exec -- opam install -v camlp4
-        if: ${{ ! startsWith(steps.conf.outputs.ocamlversion, '5.2.') }}
+        if: matrix.ocaml-compiler != 'ocaml-variants.5.2.0+msvc'
+      - run: opam exec -- env OCB=ocamlbuild ./test/runtest.sh
+        shell: bash
       - run: opam exec -- make test-external
-        if: ${{ ! startsWith(steps.conf.outputs.ocamlversion, '5.2.') }}
+        if: matrix.ocaml-compiler != 'ocaml-variants.5.2.0+msvc'
       - run: opam exec -- opam install -v mtime.1.4.0 # this tests topkg, with stub libraries
       - run: opam exec -- opam install -v inotify.2.3 # this tests oasis, with stub libraries
         if: ${{ ! startsWith(steps.conf.outputs.ocamlversion, '5.') && runner.os != 'Windows' && runner.os != 'macOS' }}

test/runtest.sh

@@ -14,19 +14,11 @@
 set -e
 cd `dirname $0`
 
-export OCB=$PWD/../ocamlbuild.native
+OCB=${OCB:-$PWD/../ocamlbuild.native}
 
-myfiglet() {
-  figlet $@ | sed 's/  *$//'
-}
+export OCB
 
-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`
 

test/test11/test.sh

@@ -15,12 +15,12 @@ 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
 $BUILD1
 echo looks if libs are there
-ls _build/b/libb.cma _build/b/libb.cmxa _build/b/libb.a
+ls _build/b/libb.cma _build/b/libb.cmxa
 $BUILD2
 $OCB -clean

test/test2/_tags

@@ -11,5 +11,6 @@
 #########################################################################
 
 "vivi.ml": camlp4o
+true: package(camlp-streams)
 
 # , some_useless_tag, \ more_useless_tags

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

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

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

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

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
@@ -36,4 +36,4 @@ else
   echo FAIL
 fi
 $OCB -clean
-rm {b,d}.mli
+rm b.mli d.mli

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

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 -no-links -classic-display $@"
 BUILD1="$BUILD $CMDOPTS"
 BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS"
 rm -rf _build

test/test9/test.sh

@@ -14,6 +14,11 @@
 set -e
 set -x
 cd `dirname $0`/../..
-ocamlc -I src ocamlbuild_pack.cmo test/test9/testglob.ml -o ./testglob.native
+if [ "$OCB" = "ocamlbuild" ]; then
+    set -- '-I' "$($OCB -where | tr -d '\r')"
+else
+    set -- '-I' 'src' '-I' 'plugin-lib'
+fi
+ocamlc "$@" -I +unix unix.cma ocamlbuildlib.cma test/test9/testglob.ml -o ./testglob.native
 ./testglob.native
 rm testglob.native

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