Replace "unsafe" function tempnam by custom code.

[tatoo.git] / Remakefile.in

diff --git a/Remakefile.in b/Remakefile.in
index 627f79c..623fb86 100644 (file)
--- a/Remakefile.in
+++ b/Remakefile.in
@@ -1,3 +1,4 @@
+.OPTIONS = variable-propagation
 OCAMLFINDPACKAGES = "ulex,unix,expat,camlp4.macro"
 OCAMLFINDSYNTAX = camlp4o
 OCAMLFINDPPOPTS = $(addprefix "-ppopt ", @CAMLP4FLAGS@ -I include)
@@ -8,6 +9,7 @@ OCAMLFINDLINKFLAGS = -linkpkg
 PACKAGE = @PACKAGE_TARNAME@
 SRC = src
 BIN = src/@PACKAGE_TARNAME@.native@EXE@
+BYTE = src/@PACKAGE_TARNAME@.byte@EXE@
 EXE = @EXE@
 
 REMAKE = @REMAKE@
@@ -77,7 +79,7 @@ distclean: clean test_clean
        base=$*
        target=$@
        NATIVE=-native
-       REMAKE="$(REMAKE) -v OCAMLNATIVE=$NATIVE"
+       REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
        OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
        SRC=$(SRC)
        COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
@@ -87,7 +89,7 @@ distclean: clean test_clean
        base=$*
        target=$@
        NATIVE=
-       REMAKE="$(REMAKE) -v OCAMLNATIVE=$NATIVE"
+       REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
        OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
        SRC=$(SRC)
        COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
@@ -97,7 +99,7 @@ distclean: clean test_clean
        base=$*
        target=$@
        NATIVE=$(OCAMLNATIVE)
-       REMAKE="$(REMAKE) -v OCAMLNATIVE=$NATIVE"
+       REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
        OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
        SRC=$(SRC)
        if test -z "$NATIVE"; then
@@ -109,28 +111,36 @@ distclean: clean test_clean
 
 ## Tests
 
-test:
+test_byte: tools $(BYTE)
+       $(REMAKE) TEST=$(BYTE) real_test
+
+test_native: tools $(BIN)
+       $(REMAKE) TEST=$(BIN) real_test
+
+test: test_native
+
+real_test:
        for i in tests/*.xml
        do
          for j in 1 2 3
          do
-               $(REMAKE) "$i".test"$j".summary
+               $(REMAKE) TEST=$(TEST) "$i".test"$j".summary
          done
        done
 
 test_clean:
        rm -rf tests/*.summary tests/*.results/*_"$(PACKAGE)"_*.*
 
-%.summary:  tools $(BIN)
-               target=$@
-               base=$*
-               test=${base#*.xml.}
-               xml=${base%.$test}
-               REMAKE=$(REMAKE)
-               BIN=$(BIN)
-               SPLIT=tools/split_path.native$(EXE)
-               XMLDIFF=tools/xml_diff.native$(EXE)
-               PACKAGE=$(PACKAGE)
-               $REMAKE $xml ${xml}.queries tests/${test}.sh
-               rm -f "$target"
-               . tests/${test}.sh
+%.summary:
+       target=$@
+       base=$*
+       test=${base#*.xml.}
+       xml=${base%.$test}
+       REMAKE=$(REMAKE)
+       BIN=$(TEST)
+       SPLIT=tools/split_path.native$(EXE)
+       XMLDIFF=tools/xml_diff.native$(EXE)
+       PACKAGE=$(PACKAGE)
+       $REMAKE $xml ${xml}.queries tests/${test}.sh
+       rm -f "$target"
+       . tests/${test}.sh