Changeset 6809 for branches/refactor/UNIT_TESTER/Makefile.test

Timestamp:

08/09/10 15:57:32 (21 months ago)

Author:

westram

Message:

• unit-tester switches to run directory itself
  • eliminates path hack for valgrind
• control leak-check by variable

Files:

• branches/refactor/UNIT_TESTER/Makefile.test (modified) (5 diffs)

branches/refactor/UNIT_TESTER/Makefile.test

@@ -15 +15 @@
 # ----------------------------------------------------------
 
+# @@@ valgrind makes tests fail atm
+# (most likely two pt-servers try to start parallel on the same port)
+
 VALGRIND=0# only test
 #VALGRIND=1# run valgrind after sucessful test
 #VALGRIND=2# run valgrind before test (useful if test traps w/o any helpful information)
+
+#CHECK_LEAKS=0# check no leaks
+CHECK_LEAKS=1# check definite leaks
+#CHECK_LEAKS=2# check reachable leaks
 
 # ----------------------------------------------------------
@@ -29 +36 @@
 #
 RESTRICT_LIB=# run all tests
+#RESTRICT_LIB=AWTC# test only this library
 #RESTRICT_LIB=mkptypes# test only these libraries
 #RESTRICT_LIB=client:arb_probe:AWTC# test only these libraries
@@ -81 +89 @@
 
 DESTDIR=tests
-RUNDIR=run
-RUN2HERE=..# prefix from RUNDIR to here (UNIT_TESTER)
+RUNDIR=run# see also UnitTester.cxx@chdir
 
 SYMLIST=$(DESTDIR)/$(UNIQUE_NAME).sym
@@ -152 +159 @@
         @echo "LINKDEPS       ='$(LINKDEPS)'"
 
+ifeq ($(CHECK_LEAKS),0)
+        LEAKS:=
+else
+ifeq ($(CHECK_LEAKS),1)
+        LEAKS:=-l
+else
+        LEAKS:=-l -r
+endif
+endif
+
 valgrind:
         echo "Valgrinding.."
-        cd $(RUNDIR);$(ARBHOME)/SOURCE_TOOLS/arb_valgrind -q -l -r -c 15 $(RUN2HERE)/$(TEST_EXE)
+        $(ARBHOME)/SOURCE_TOOLS/arb_valgrind -q $(LEAKS) -c 15 $(TEST_EXE)
 
 perform_test: $(TEST_EXE)
@@ -161 +178 @@
         $(MAKE) -f Makefile.test valgrind
 endif
-        cd $(RUNDIR);$(RUN2HERE)/$(TEST_EXE)
+        $(TEST_EXE) 
 ifeq ($(COVERAGE),1)
         @echo "-------------------- test-coverage for $(UNITLIBNAME)"