Fresco/Fresco-Test/syunit-c++/test Makefile.in,1.2,1.3

Update of /cvs/fresco/Fresco/Fresco-Test/syunit-c++/test
In directory purcel:/tmp/cvs-serv20721/Fresco-Test/syunit-c++/test

Modified Files:
	Makefile.in 
Log Message:
Try "make build-tests && make run-tests" in Fresco-Test and Babylon :-)


Index: Makefile.in
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-Test/syunit-c++/test/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.in	4 Apr 2003 22:09:59 -0000	1.2
+++ Makefile.in	5 Apr 2003 22:37:35 -0000	1.3
@@ -35,15 +35,20 @@
 CXXFLAGS	+= $(SO_CXXFLAGS)
 LDFLAGS		+= $(SO_LDFLAGS)
 
+# All tests ending in .cc will be build, the rest will be run on
+# "make run-tests".
 TESTS		:= test-ResultsMap.cc
 
+CXX_TESTS	:= $(filter %.cc, $(TESTS))
 HDR		:= 
-SYN		:= $(patsubst %.cc, %.syn, $(TESTS))
+SYN		:= $(patsubst %.cc, %.syn, $(CXX_TESTS))
 HARNESS		:= $(patsubst %.syn, %-harness.cxx, $(SYN))
 DEP		:= $(patsubst %.cxx, %.d, $(HARNESS))
 OBJ		:= $(patsubst %.cxx, %.o, $(HARNESS))
 
-TARGETS		:= $(patsubst %.cc, %, $(TESTS))
+TARGETS		:= $(patsubst %.cc, ./%, $(CXX_TESTS))
+SCRIPTS		:= $(filter-out %.cc, $(TESTS))
+SCRIPT_SOURCES	:= $(patsubst %, $(srcdir)/%, $(SCRIPTS))
 MANUAL		:= $(docdir)/html
 
 vpath %.hh  $(hdir)
@@ -57,8 +62,8 @@
 
 build-tests: $(TARGETS)
 
-run-tests:
-	@echo RUNNING ALL TESTS.
+run-tests: build-tests $(SCRIPT_SOURCES)
+	LD_LIBRARY_PATH=`$(TEST_CONFIG) --lib-dir`:$(LD_LIBRARY_PATH) `$(TEST_CONFIG) --test-runner` $(TARGETS) $(SCRIPT_SOURCES)
 
 $(TARGETS): $(OBJ)
 	@echo linking $(@F)
@@ -82,13 +87,13 @@
 
 maintainer-clean: distclean
 
-$(SYN): $(TESTS)
+$(SYN): $(CXX_TESTS)
 	@echo generating $(@F)
-	$(SYNOPSIS) -pC++ -I$(hdir) -o $@ $<
+	$(SYNOPSIS) -pC++ -I`$(TEST_CONFIG) --include-dir` -o $@ $<
 
 $(HARNESS): $(SYN)
 	@echo generating test harness for $(@F)
-	$(SYN2CC) $< $@
+	`$(TEST_CONFIG) --syn2cc` $< $@
 
 $(DEP): $(HARNESS)
 	@echo generating dependencies for $(<F)