remove extra dependencies

- I stop link all library on unit test

diff --git a/.gitignore b/.gitignore
index 9a5a0b9..5dafddc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 *.spot
 *.spit
 *.annot
+*.runner
 
 
 # auto generate file

diff --git a/OMakefile b/OMakefile
index 4a9cead..a4a5799 100644 (file)
--- a/OMakefile
+++ b/OMakefile
@@ -21,7 +21,7 @@ else
 
 Shell. +=
     ocaml-clean(argv) =
-      rm -f *.cm[aiox] *.o *.omc *.opt *.run *~ $(argv) *.cmxa *.a *.spot *.spit *.annot
+      rm -f *.cm[aiox] *.o *.omc *.opt *.run *~ $(argv) *.cmxa *.a *.spot *.spit *.annot *.runner
 
 # ------------------------------
 # camlp4 rules
@@ -45,18 +45,18 @@ Shell. +=
       (grep "FAIL\|ERROR\|Error\|Fail" && exit 1) || exit 0
 
 public.OUnitTest(name,files) =
-       .PHONY: check check-$(name) clean
+       protected.test_file = $(addsuffix Test,$(name))
+       protected.target    = $(addsuffix .runner,$(test_file))
        protected.src_files = $(addprefix $(OUNIT_SRC_DIR),$(files))
-       OCamlProgram($(name),$(name) $(src_files) $(OUNIT_LIBS))
 
-       check-$(name): $(name)$(EXE)
-               ./$(name)$(EXE) | ounit-postproc
+       .PHONY: check check-$(name) clean
+       OCamlProgram($(target), $(test_file) $(src_files) $(OUNIT_LIBS))
+
+       check-$(name): $(target)
+               $(addprefix ./,$(target)) | ounit-postproc
 
        check: check-$(name)
 
-       clean:
-               rm -f $(name)$(EXE)
-
        export
 
 # ------------------------------

diff --git a/driver/test/OMakefile b/driver/test/OMakefile
index 43ff20f..99e2e2c 100644 (file)
--- a/driver/test/OMakefile
+++ b/driver/test/OMakefile
@@ -19,8 +19,8 @@ OCAMLINCLUDES += $(ROOT)/base/
 
 OCAML_LIBS += $(ROOT)/base/base
 
-OUnitTest(colorTest,color)
-OUnitTest(ruleTest,rule)
+OUnitTest(color,color)
+OUnitTest(rule ,rule)
 
 #
 # PHONY TARGET

diff --git a/scm/src/parser/OMakefile b/scm/src/parser/OMakefile
index 6fcb304..a1ffc96 100644 (file)
--- a/scm/src/parser/OMakefile
+++ b/scm/src/parser/OMakefile
@@ -6,6 +6,7 @@ OCAMLPACKS[] =
 UseCamlp4(pa_oo)
 
 FILES[] =
+       token
        parsec
        lexer
        sexp

diff --git a/scm/test/OMakefile b/scm/test/OMakefile
index dab8c6b..0e1d1dd 100644 (file)
--- a/scm/test/OMakefile
+++ b/scm/test/OMakefile
@@ -26,19 +26,16 @@ FILES[] =
        hListTest
        interCodeTest
 
-PROGRAM = runner
-OCAML_LIBS += $(SRC)/habc-scm
-
-OCamlProgram($(PROGRAM), $(FILES))
-
+E[]=
+OUnitTest(base,$(E))
+OUnitTest(hList,$(E))
+OUnitTest(interCode,interCode)
 #############################################################
 #
 # PHONY Target
 #
 .DEFAULT: check
 
-check: $(PROGRAM)$(EXE)
-       ./$(PROGRAM)$(EXE) | ounit-postproc
 
 clean:
-       ocaml-clean $(PROGRAM)
+       ocaml-clean

diff --git a/scm/test/codegen/OMakefile b/scm/test/codegen/OMakefile
index 27eacea..1742c5a 100644 (file)
--- a/scm/test/codegen/OMakefile
+++ b/scm/test/codegen/OMakefile
@@ -17,12 +17,22 @@ FILES[] =
        codegenClassTest
        overrideTest
 
-PROGRAM = runner
-
 OCAMLINCLUDES += $(SRC)/codegen/
-OCAML_LIBS    += $(SRC)/codegen/codegen
+OUNIT_SRC_DIR=$(SRC)/codegen/
+
+OUNIT_LIBS+=astUtil
+
+OUnitTest(bytes        , bytes label)
+OUnitTest(abc          , abc label bytes)
+OUnitTest(revList      , revList)
+OUnitTest(cpool        , cpool abc revList label bytes)
+OUnitTest(closureTrans , closureTrans module)
+OUnitTest(asm          , asm abc label revList cpool bytes instruction)
+OUnitTest(codegenExpr  , codegen label cpool asm bytes revList instruction)
+OUnitTest(codegenStmt  , codegen label cpool asm bytes revList instruction)
+OUnitTest(codegenClass , codegen label cpool asm bytes revList instruction)
+OUnitTest(override     , override binding module)
 
-OCamlProgram($(PROGRAM), $(FILES))
 
 #############################################################
 #
@@ -30,8 +40,5 @@ OCamlProgram($(PROGRAM), $(FILES))
 #
 .DEFAULT: check
 
-check: $(PROGRAM)$(EXE)
-       ./$(PROGRAM)$(EXE) | ounit-postproc
-
 clean:
-       ocaml-clean $(PROGRAM)
+       ocaml-clean

diff --git a/scm/test/filter/OMakefile b/scm/test/filter/OMakefile
index c0c0837..c107314 100644 (file)
--- a/scm/test/filter/OMakefile
+++ b/scm/test/filter/OMakefile
@@ -4,16 +4,10 @@
 # Build an OCaml program
 #
 
-FILES[] =
-       astUtil
-       bindingTest
-
-PROGRAM = runner
-
 OCAMLINCLUDES += $(SRC)/filter
-OCAML_LIBS    += $(SRC)/filter/filter
-
-OCamlProgram($(PROGRAM), $(FILES))
+OUNIT_SRC_DIR=$(SRC)/filter/
+OUNIT_LIBS+=astUtil
+OUnitTest(binding, binding)
 
 #############################################################
 #
@@ -21,8 +15,5 @@ OCamlProgram($(PROGRAM), $(FILES))
 #
 .DEFAULT: check
 
-check: $(PROGRAM)$(EXE)
-       ./$(PROGRAM)$(EXE) | ounit-postproc
-
 clean:
-       ocaml-clean $(PROGRAM)
+       ocaml-clean

diff --git a/scm/test/parser/OMakefile b/scm/test/parser/OMakefile
index 7e9d4c5..71f9bd6 100644 (file)
--- a/scm/test/parser/OMakefile
+++ b/scm/test/parser/OMakefile
@@ -5,28 +5,19 @@
 # Build an OCaml program
 #
 
-FILES[] =
-       lexerTest
-       sexpTest
-       astUtil
-       lispTest
-
-PROGRAM = runner
-
-
 OCAMLINCLUDES += $(SRC)/parser
-OCAML_LIBS    += $(SRC)/parser/parser
+OUNIT_LIBS += astUtil
+OUNIT_SRC_DIR=$(SRC)/parser/
+
+OUnitTest(lexer ,lexer parsec)
+OUnitTest(sexp  ,sexp lexer parsec)
+OUnitTest(lisp  ,lisp sexp parsec lexer)
 
-OCamlProgram($(PROGRAM), $(FILES))
 
 #############################################################
 #
 # PHONY Target
 #
-.DEFAULT: check
-
-check: $(PROGRAM)$(EXE)
-       ./$(PROGRAM)$(EXE) | ounit-postproc
 
 clean:
-       ocaml-clean $(PROGRAM)
+       ocaml-clean

diff --git a/scm/test/type/OMakefile b/scm/test/type/OMakefile
index ac0f3ae..5536e34 100644 (file)
--- a/scm/test/type/OMakefile
+++ b/scm/test/type/OMakefile
@@ -5,16 +5,11 @@
 # Build an OCaml program
 #
 
-FILES[] =
-       psetTest
-       nodeTest
-
-PROGRAM = runner
-
 OCAMLINCLUDES += $(SRC)/type
-OCAML_LIBS    += $(SRC)/type/type
+OUNIT_SRC_DIR=$(SRC)/type/
 
-OCamlProgram($(PROGRAM), $(FILES))
+OUnitTest(pset, pSet)
+OUnitTest(node, node)
 
 #############################################################
 #
@@ -22,8 +17,5 @@ OCamlProgram($(PROGRAM), $(FILES))
 #
 .DEFAULT: check
 
-check: $(PROGRAM)$(EXE)
-       ./$(PROGRAM)$(EXE) | ounit-postproc
-
 clean:
-       ocaml-clean $(PROGRAM)
+       ocaml-clean

diff --git a/xml/test/OMakefile b/xml/test/OMakefile
index d1621b9..b1d7693 100644 (file)
--- a/xml/test/OMakefile
+++ b/xml/test/OMakefile
@@ -26,10 +26,10 @@ FILES[] =
 OCAMLINCLUDES += $(ROOT)/base/
 OCAML_LIBS += $(ROOT)/base/base
 
-OUnitTest(byteTest   ,byte parsec)
-OUnitTest(abcTest    ,abc parsec disasm byte)
-OUnitTest(swfmillTest,swfmill easyXml abc code byte disasm parsec)
-OUnitTest(codeTest   ,code easyXml)
+OUnitTest(byte   ,byte parsec)
+OUnitTest(abc    ,abc parsec disasm byte)
+OUnitTest(swfmill,swfmill easyXml abc code byte disasm parsec)
+OUnitTest(code   ,code easyXml)
 
 #
 # PHONY TARGET