Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always store full path to ocamlbuild in a variable that is available to the sub-tests 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13152 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Wojciech Meyer 2012-12-22 01:34:19 +00:00
parent 469ae8ae60
commit 38dc96e0be
11 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ocamlbuild/test/runtest.sh
View File

@ -14,6 +14,8 @@
set -e set -e
cd `dirname $0` cd `dirname $0`
export OCB=$PWD/../../_build/ocamlbuild/ocamlbuild.native
myfiglet() { myfiglet() {
figlet $@ | sed 's/ *$//' figlet $@ | sed 's/ *$//'
} }
@ -44,5 +46,11 @@ $BANNER Test8
./test8/test.sh $@ ./test8/test.sh $@
$BANNER Test9 $BANNER Test9
./test9/test.sh $@ ./test9/test.sh $@
$BANNER Test10
./test10/test.sh $@
$BANNER Test11
./test11/test.sh $@
$BANNER Test12
./test12/test.sh $@
$BANNER Test Virtual Targets $BANNER Test Virtual Targets
./test_virtual/test.sh $@ ./test_virtual/test.sh $@

2
ocamlbuild/test/test10/test.sh
View File

@ -14,5 +14,5 @@
set -e set -e
set -x set -x
cd `dirname $0`/../.. cd `dirname $0`/../..
./_build/ocamlbuild.native -quiet -build-dir _buildtest -no-links test/test9/testglob.native $OCB -quiet -build-dir _buildtest -no-links test/test9/testglob.native
./_buildtest/test/test9/testglob.native ./_buildtest/test/test9/testglob.native

2
ocamlbuild/test/test11/test.sh
View File

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

2
ocamlbuild/test/test2/test.sh
View File

@ -15,7 +15,7 @@ cd `dirname $0`
set -e set -e
set -x set -x
CMDOPTS="-- -help" CMDOPTS="-- -help"
BUILD="../../_build/ocamlbuild.native toto.byte toto.native -no-skip -classic-display $@" BUILD="$OCB toto.byte toto.native -no-skip -classic-display $@"
BUILD1="$BUILD $CMDOPTS" BUILD1="$BUILD $CMDOPTS"
BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS" BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS"
rm -rf _build rm -rf _build

2
ocamlbuild/test/test3/test.sh
View File

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

2
ocamlbuild/test/test4/test.sh
View File

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

2
ocamlbuild/test/test5/test.sh
View File

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

2
ocamlbuild/test/test6/test.sh
View File

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

2
ocamlbuild/test/test7/test.sh
View File

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

2
ocamlbuild/test/test8/test.sh
View File

@ -15,7 +15,7 @@ cd `dirname $0`
set -e set -e
set -x set -x
CMDOPTS="" # -- command args CMDOPTS="" # -- command args
BUILD="../../_build/ocamlbuild.native 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-skip -classic-display $@"
BUILD1="$BUILD $CMDOPTS" BUILD1="$BUILD $CMDOPTS"
BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS" BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS"
rm -rf _build rm -rf _build

2
ocamlbuild/test/test9/test.sh
View File

@ -14,5 +14,5 @@
set -e set -e
set -x set -x
cd `dirname $0`/../.. cd `dirname $0`/../..
./_build/ocamlbuild.native -quiet -build-dir _buildtest -no-links test/test9/testglob.native $@ $OCB -quiet -build-dir _buildtest -no-links test/test9/testglob.native $@
./_buildtest/test/test9/testglob.native ./_buildtest/test/test9/testglob.native