diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2007-10-07 09:57:29 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2007-10-07 09:57:29 +0000 |
| commit | 26071c77e356f0a96250b89ef7697ee7dccedf73 (patch) | |
| tree | e1772226337aa42ce57cebd1a2068c49e5544609 /test/Makefile.in | |
| parent | ff8bac5e11aac2cf623638a3e1f59abc61b3645b (diff) | |
| download | libapr-26071c77e356f0a96250b89ef7697ee7dccedf73.tar.gz | |
Refactor the build to know x64 (on Visual Studios which
support it) - intended for backport, and make -DWINNT
the default (not intended for backport) with new 9x
compatible flavor targets.
Also invoke the make test/ check from either the testdll
or testlib targets of test/testall.dsw (this both builds
and runs the test suite inside the studio).
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@582604 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/Makefile.in')
| -rw-r--r-- | test/Makefile.in | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index 20d3485bc..52c9fa2bc 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -22,7 +22,18 @@ OTHER_PROGRAMS = \ echod@EXEEXT@ \ sockperf@EXEEXT@ -PROGRAMS = $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) $(OTHER_PROGRAMS) +TESTALL_COMPONENTS = \ + mod_test.la \ + libmod_test.la \ + occhild@EXEEXT@ \ + readchild@EXEEXT@ + proc_child@EXEEXT@ \ + tryread@EXEEXT@ \ + sockchild@EXEEXT@ \ + globalmutexchild@EXEEXT@ + + +PROGRAMS = $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) $(OTHER_PROGRAMS) TARGETS = $(PROGRAMS) @@ -44,7 +55,7 @@ INCLUDES=-I$(INCDIR) -I$(srcdir)/../include # libtool wrapper scripts which link an executable when first run. LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) @LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@ -check: $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) +check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) teststatus=0; \ progfailed=""; \ for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \ @@ -122,10 +133,7 @@ TESTS = testutil.lo testtime.lo teststr.lo testvsn.lo testipsub.lo \ testshm.lo testsock.lo testglobalmutex.lo teststrnatcmp.lo testfilecopy.lo \ testtemp.lo testlfs.lo testcond.lo -testall@EXEEXT@: $(TESTS) mod_test.la libmod_test.la occhild@EXEEXT@ \ - readchild@EXEEXT@ abts.lo proc_child@EXEEXT@ \ - tryread@EXEEXT@ sockchild@EXEEXT@ globalmutexchild@EXEEXT@ \ - $(LOCAL_LIBS) +testall@EXEEXT@: $(TESTS) abts.lo $(LINK_PROG) $(TESTS) abts.lo $(LOCAL_LIBS) $(ALL_LIBS) |