diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2010-02-09 14:44:19 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2010-02-09 14:44:19 +0000 |
| commit | 2faa92d765778a56dbb12d3989b4ea64437f332a (patch) | |
| tree | 6246037df213e079ac209daa07bfd6955ee259a8 | |
| parent | c53dc927d08999b1a7688409651b96f39fae7798 (diff) | |
ignore generated files
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9624 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | testsuite/.svnignore | 9 | ||||
| -rw-r--r-- | testsuite/tests/lib-dynlink-bytecode/.svnignore | 6 | ||||
| -rw-r--r-- | testsuite/tests/lib-dynlink-native/.svnignore | 5 | ||||
| -rw-r--r-- | testsuite/tests/lib-scanf-2/Makefile | 8 | ||||
| -rw-r--r-- | testsuite/tests/runtime-errors/Makefile | 6 | ||||
| -rw-r--r-- | testsuite/tests/tool-lexyacc/.svnignore | 6 |
6 files changed, 33 insertions, 7 deletions
diff --git a/testsuite/.svnignore b/testsuite/.svnignore new file mode 100644 index 000000000..93feea3be --- /dev/null +++ b/testsuite/.svnignore @@ -0,0 +1,9 @@ +# svn propset -R svn:ignore -F .svnignore . +# find . -name .svnignore -print | while read f; do svn propset svn:ignore -F $f `dirname $f`; done +_log +*.so +*.a +*.result +*.byte +*.native +program diff --git a/testsuite/tests/lib-dynlink-bytecode/.svnignore b/testsuite/tests/lib-dynlink-bytecode/.svnignore new file mode 100644 index 000000000..125439c78 --- /dev/null +++ b/testsuite/tests/lib-dynlink-bytecode/.svnignore @@ -0,0 +1,6 @@ +main +static +custom +*.a +*.so +*.result diff --git a/testsuite/tests/lib-dynlink-native/.svnignore b/testsuite/tests/lib-dynlink-native/.svnignore new file mode 100644 index 000000000..94f13b81a --- /dev/null +++ b/testsuite/tests/lib-dynlink-native/.svnignore @@ -0,0 +1,5 @@ +mypack.pack.s +result +main +*.so +*.a diff --git a/testsuite/tests/lib-scanf-2/Makefile b/testsuite/tests/lib-scanf-2/Makefile index eb7eb2ba1..b6bd9aa1f 100644 --- a/testsuite/tests/lib-scanf-2/Makefile +++ b/testsuite/tests/lib-scanf-2/Makefile @@ -1,15 +1,15 @@ default: compile run compile: tscanf2_io.cmo tscanf2_io.cmx - @$(OCAMLC) unix.cma tscanf2_io.cmo -o master.bytecode tscanf2_master.ml - @$(OCAMLC) tscanf2_io.cmo -o slave.bytecode tscanf2_slave.ml + @$(OCAMLC) unix.cma tscanf2_io.cmo -o master.byte tscanf2_master.ml + @$(OCAMLC) tscanf2_io.cmo -o slave.byte tscanf2_slave.ml @$(OCAMLOPT) unix.cmxa tscanf2_io.cmx -o master.native tscanf2_master.ml @$(OCAMLOPT) tscanf2_io.cmx -o slave.native tscanf2_slave.ml run: @echo -n " ... testing with ocamlc" - @./master.bytecode ./slave.bytecode > result.bytecode 2>&1 - @diff -q reference result.bytecode > /dev/null || (echo " => failed" && exit 1) + @./master.byte ./slave.byte > result.byte 2>&1 + @diff -q reference result.byte > /dev/null || (echo " => failed" && exit 1) @echo -n " ocamlopt" @./master.native ./slave.native > result.native 2>&1 @diff -q reference result.native > /dev/null || (echo " => failed" && exit 1) diff --git a/testsuite/tests/runtime-errors/Makefile b/testsuite/tests/runtime-errors/Makefile index ffaccdf47..5f5cb5570 100644 --- a/testsuite/tests/runtime-errors/Makefile +++ b/testsuite/tests/runtime-errors/Makefile @@ -6,11 +6,11 @@ compile: $(OCAMLOPT) -w a -o `basename $$f ml`native $$f; \ done @if [ ! `grep -c HAS_STACK_OVERFLOW_DETECTION ../../../config/s.h` ]; then \ - rm -f stackoverflow.bytecode stackoverflow.native; \ + rm -f stackoverflow.byte stackoverflow.native; \ fi run: - @for f in *.bytecode; do \ + @for f in *.byte; do \ echo -n " ... testing '$$f':"; \ (./$$f > $$f.result 2>&1; true); \ diff -q $$f.reference $$f.result > /dev/null || (echo " => failed" && exit 1) && echo " => passed"; \ @@ -20,6 +20,6 @@ run: done clean: defaultclean - @rm -f *.bytecode *.native *.result + @rm -f *.byte *.native *.result include ../../makefiles/Makefile.common diff --git a/testsuite/tests/tool-lexyacc/.svnignore b/testsuite/tests/tool-lexyacc/.svnignore new file mode 100644 index 000000000..5c0431d4d --- /dev/null +++ b/testsuite/tests/tool-lexyacc/.svnignore @@ -0,0 +1,6 @@ +scanner.ml +grammar.mli +grammar.ml +*.byte +*.native +*.result |