11 files changed, 18 insertions, 10 deletions
diff --git a/ocamlbuild/test/runtest.sh b/ocamlbuild/test/runtest.sh
index 22f5f0c677..600f4232f9 100755
--- a/ocamlbuild/test/runtest.sh
+++ b/ocamlbuild/test/runtest.sh
@@ -14,6 +14,8 @@
 set -e
 cd `dirname $0`
 
+export OCB=$PWD/../../_build/ocamlbuild/ocamlbuild.native
+
 myfiglet() {
   figlet $@ | sed 's/  *$//'
 }
@@ -44,5 +46,11 @@ $BANNER Test8
 ./test8/test.sh $@
 $BANNER Test9
 ./test9/test.sh $@
+$BANNER Test10
+./test10/test.sh $@
+$BANNER Test11
+./test11/test.sh $@
+$BANNER Test12
+./test12/test.sh $@
 $BANNER Test Virtual Targets
 ./test_virtual/test.sh $@
diff --git a/ocamlbuild/test/test10/test.sh b/ocamlbuild/test/test10/test.sh
index 4c612cf202..2ff2340466 100755
--- a/ocamlbuild/test/test10/test.sh
+++ b/ocamlbuild/test/test10/test.sh
@@ -14,5 +14,5 @@
 set -e
 set -x
 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
diff --git a/ocamlbuild/test/test11/test.sh b/ocamlbuild/test/test11/test.sh
index 8a7a76de80..989d051d59 100755
--- a/ocamlbuild/test/test11/test.sh
+++ b/ocamlbuild/test/test11/test.sh
@@ -15,7 +15,7 @@ cd `dirname $0`
 set -e
 set -x
 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"
 BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS"
 rm -rf _build
diff --git a/ocamlbuild/test/test2/test.sh b/ocamlbuild/test/test2/test.sh
index 49494381b3..0843ce42e8 100755
--- a/ocamlbuild/test/test2/test.sh
+++ b/ocamlbuild/test/test2/test.sh
@@ -15,7 +15,7 @@ cd `dirname $0`
 set -e
 set -x
 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"
 BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS"
 rm -rf _build
diff --git a/ocamlbuild/test/test3/test.sh b/ocamlbuild/test/test3/test.sh
index 3e36a3188b..d3b28526a2 100755
--- a/ocamlbuild/test/test3/test.sh
+++ b/ocamlbuild/test/test3/test.sh
@@ -15,7 +15,7 @@ cd `dirname $0`
 set -e
 set -x
 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"
 BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS"
 rm -rf _build
diff --git a/ocamlbuild/test/test4/test.sh b/ocamlbuild/test/test4/test.sh
index f085dc8ca4..46b7129db4 100755
--- a/ocamlbuild/test/test4/test.sh
+++ b/ocamlbuild/test/test4/test.sh
@@ -15,7 +15,7 @@ cd `dirname $0`
 set -e
 set -x
 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"
 BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS"
 rm -rf _build
diff --git a/ocamlbuild/test/test5/test.sh b/ocamlbuild/test/test5/test.sh
index 91e29322bd..30bba5ced4 100755
--- a/ocamlbuild/test/test5/test.sh
+++ b/ocamlbuild/test/test5/test.sh
@@ -15,7 +15,7 @@ cd `dirname $0`
 set -e
 set -x
 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"
 BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS"
 rm -rf _build
diff --git a/ocamlbuild/test/test6/test.sh b/ocamlbuild/test/test6/test.sh
index d8696d90c4..8fb2e67ef3 100755
--- a/ocamlbuild/test/test6/test.sh
+++ b/ocamlbuild/test/test6/test.sh
@@ -15,7 +15,7 @@ cd `dirname $0`
 set -x
 rm -rf _build
 CMDOPTS="" # -- command args
-BUILD="../../_build/ocamlbuild.native -no-skip main.byte -classic-display $@"
+BUILD="$OCB -no-skip 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/ocamlbuild/test/test7/test.sh b/ocamlbuild/test/test7/test.sh
index 33172b263a..1d4eb1b595 100755
--- a/ocamlbuild/test/test7/test.sh
+++ b/ocamlbuild/test/test7/test.sh
@@ -15,7 +15,7 @@ cd `dirname $0`
 set -e
 set -x
 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"
 BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDARGS"
 rm -rf _build
diff --git a/ocamlbuild/test/test8/test.sh b/ocamlbuild/test/test8/test.sh
index 0aa8644a25..9b57933c65 100755
--- a/ocamlbuild/test/test8/test.sh
+++ b/ocamlbuild/test/test8/test.sh
@@ -15,7 +15,7 @@ cd `dirname $0`
 set -e
 set -x
 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"
 BUILD2="$BUILD -verbose 0 -nothing-should-be-rebuilt $CMDOPTS"
 rm -rf _build
diff --git a/ocamlbuild/test/test9/test.sh b/ocamlbuild/test/test9/test.sh
index 894ec15cac..aaed954c29 100755
--- a/ocamlbuild/test/test9/test.sh
+++ b/ocamlbuild/test/test9/test.sh
@@ -14,5 +14,5 @@
 set -e
 set -x
 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