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

[ocamlbuild] Update the tests. 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8546 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Nicolas Pouillard 2007-11-21 16:38:34 +00:00
parent e1bf691bf1
commit f0dc0e240b
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ocamlbuild/test/good-output
View File

@ -417,15 +417,14 @@ PASS
| | __/\__ \ |_ / / | | __/\__ \ |_ / /
|_|\___||___/\__/_/ |_|\___||___/\__/_/
+ svn=svk
+ CMDOPTS= + CMDOPTS=
+ BUILD=../../_build/ocamlbuild.native bbcc.cma main.byte bbcc.cmxa main.native -no-skip -classic-display + BUILD=../../_build/ocamlbuild.native bbcc.cma main.byte bbcc.cmxa main.native -no-skip -classic-display
+ BUILD1=../../_build/ocamlbuild.native bbcc.cma main.byte bbcc.cmxa main.native -no-skip -classic-display + BUILD1=../../_build/ocamlbuild.native bbcc.cma main.byte bbcc.cmxa main.native -no-skip -classic-display
+ BUILD2=../../_build/ocamlbuild.native bbcc.cma main.byte bbcc.cmxa main.native -no-skip -classic-display -verbose 0 -nothing-should-be-rebuilt + BUILD2=../../_build/ocamlbuild.native bbcc.cma main.byte bbcc.cmxa main.native -no-skip -classic-display -verbose 0 -nothing-should-be-rebuilt
+ rm -rf _build + rm -rf _build
+ svk revert bb.ml + cp bb1.ml bb.ml
+ ../../_build/ocamlbuild.native bbcc.cma main.byte bbcc.cmxa main.native -no-skip -classic-display + ../../_build/ocamlbuild.native bbcc.cma main.byte bbcc.cmxa main.native -no-skip -classic-display
ocamlopt.opt -I /Users/ertai/w/inria/ocaml/ocaml-cvs-ocamlbuild/ocamlbuild/_install/lib/ocamlbuild unix.cmxa /Users/ertai/w/inria/ocaml/ocaml-cvs-ocamlbuild/ocamlbuild/_install/lib/ocamlbuild/ocamlbuildlib.cmxa myocamlbuild.ml /Users/ertai/w/inria/ocaml/ocaml-cvs-ocamlbuild/ocamlbuild/_install/lib/ocamlbuild/ocamlbuild.cmx -o myocamlbuild ocamlopt.opt -I /Users/ertai/wd/inria/ocaml/CVS-copy/ocamlbuild-feature/ocamlbuild/_install/lib/ocamlbuild unix.cmxa /Users/ertai/wd/inria/ocaml/CVS-copy/ocamlbuild-feature/ocamlbuild/_install/lib/ocamlbuild/ocamlbuildlib.cmxa myocamlbuild.ml /Users/ertai/wd/inria/ocaml/CVS-copy/ocamlbuild-feature/ocamlbuild/_install/lib/ocamlbuild/ocamlbuild.cmx -o myocamlbuild
ocamldep.opt -modules bb.mli > bb.mli.depends ocamldep.opt -modules bb.mli > bb.mli.depends
ocamlc.opt -c -o bb.cmi bb.mli ocamlc.opt -c -o bb.cmi bb.mli
ocamldep.opt -modules bb.ml > bb.ml.depends ocamldep.opt -modules bb.ml > bb.ml.depends
@ -601,8 +600,6 @@ ocamlopt.opt aa.cmx c2.cmx bbcc.cmxa c3.cmx main.cmx -o main.native
[cache hit] ocamlopt.opt -c -o c3.cmx c3.ml [cache hit] ocamlopt.opt -c -o c3.cmx c3.ml
[cache hit] ocamlopt.opt -c -o main.cmx main.ml [cache hit] ocamlopt.opt -c -o main.cmx main.ml
[cache hit] ocamlopt.opt aa.cmx c2.cmx bbcc.cmxa c3.cmx main.cmx -o main.native [cache hit] ocamlopt.opt aa.cmx c2.cmx bbcc.cmxa c3.cmx main.cmx -o main.native
+ svk revert bb.ml
Reverted bb.ml
_____ _ ___ _____ _ ___
|_ _|__ ___| |_( _ ) |_ _|__ ___| |_( _ )
| |/ _ \/ __| __/ _ \ | |/ _ \/ __| __/ _ \
@ -615,7 +612,7 @@ Reverted bb.ml
+ BUILD2=../../_build/ocamlbuild.native a.byte a.native -no-skip -classic-display -verbose 0 -nothing-should-be-rebuilt + BUILD2=../../_build/ocamlbuild.native a.byte a.native -no-skip -classic-display -verbose 0 -nothing-should-be-rebuilt
+ rm -rf _build + rm -rf _build
+ ../../_build/ocamlbuild.native a.byte a.native -no-skip -classic-display + ../../_build/ocamlbuild.native a.byte a.native -no-skip -classic-display
ocamlopt.opt -I /Users/ertai/w/inria/ocaml/ocaml-cvs-ocamlbuild/ocamlbuild/_install/lib/ocamlbuild unix.cmxa /Users/ertai/w/inria/ocaml/ocaml-cvs-ocamlbuild/ocamlbuild/_install/lib/ocamlbuild/ocamlbuildlib.cmxa myocamlbuild.ml /Users/ertai/w/inria/ocaml/ocaml-cvs-ocamlbuild/ocamlbuild/_install/lib/ocamlbuild/ocamlbuild.cmx -o myocamlbuild ocamlopt.opt -I /Users/ertai/wd/inria/ocaml/CVS-copy/ocamlbuild-feature/ocamlbuild/_install/lib/ocamlbuild unix.cmxa /Users/ertai/wd/inria/ocaml/CVS-copy/ocamlbuild-feature/ocamlbuild/_install/lib/ocamlbuild/ocamlbuildlib.cmxa myocamlbuild.ml /Users/ertai/wd/inria/ocaml/CVS-copy/ocamlbuild-feature/ocamlbuild/_install/lib/ocamlbuild/ocamlbuild.cmx -o myocamlbuild
ocamldep.opt -modules a.ml > a.ml.depends ocamldep.opt -modules a.ml > a.ml.depends
ocamldep.opt -modules myconfig.ml > myconfig.ml.depends ocamldep.opt -modules myconfig.ml > myconfig.ml.depends
ocamlc.opt -c -o myconfig.cmo myconfig.ml ocamlc.opt -c -o myconfig.cmo myconfig.ml
@ -639,8 +636,8 @@ ocamlopt.opt myconfig.cmx a.cmx -o a.native
| | __/\__ \ |_ \__, | | | __/\__ \ |_ \__, |
|_|\___||___/\__| /_/ |_|\___||___/\__| /_/
++ dirname ./test9/test.sh ++ dirname test9/test.sh
+ cd ./test9/../.. + cd test9/../..
+ ./_build/ocamlbuild.native -quiet -build-dir _buildtest -no-links test/test9/testglob.native + ./_build/ocamlbuild.native -quiet -build-dir _buildtest -no-links test/test9/testglob.native
+ ./_buildtest/test/test9/testglob.native + ./_buildtest/test/test9/testglob.native
Globexp for "\"hello\"" OK Globexp for "\"hello\"" OK

0
ocamlbuild/test/test7/bb.ml → ocamlbuild/test/test7/bb1.ml
View File

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

@ -2,13 +2,12 @@
cd `dirname $0` cd `dirname $0`
set -e set -e
set -x set -x
svn=svk
CMDOPTS="" # -- command args CMDOPTS="" # -- command args
BUILD="../../_build/ocamlbuild.native bbcc.cma main.byte bbcc.cmxa main.native -no-skip -classic-display $@" BUILD="../../_build/ocamlbuild.native 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
$svn revert bb.ml cp bb1.ml bb.ml
$BUILD1 $BUILD1
$BUILD2 $BUILD2
cp bb2.ml bb.ml cp bb2.ml bb.ml
@ -17,4 +16,3 @@ $BUILD2
cp bb3.ml bb.ml cp bb3.ml bb.ml
$BUILD1 -verbose 0 $BUILD1 -verbose 0
$BUILD2 $BUILD2
$svn revert bb.ml