You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by iv...@apache.org on 2022/06/18 13:01:56 UTC
svn commit: r1902041 - in /apr/apr/branches/1.8.x: ./ CMakeLists.txt
Author: ivan
Date: Sat Jun 18 13:01:56 2022
New Revision: 1902041
URL: http://svn.apache.org/viewvc?rev=1902041&view=rev
Log:
On 1.8.x branch: Merge r1902017 from trunk:
CMakeLists: Make testall test suites separate tests in terms
of CMake/CTest.
Modified:
apr/apr/branches/1.8.x/ (props changed)
apr/apr/branches/1.8.x/CMakeLists.txt
Propchange: apr/apr/branches/1.8.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1902017
Modified: apr/apr/branches/1.8.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.8.x/CMakeLists.txt?rev=1902041&r1=1902040&r2=1902041&view=diff
==============================================================================
--- apr/apr/branches/1.8.x/CMakeLists.txt (original)
+++ apr/apr/branches/1.8.x/CMakeLists.txt Sat Jun 18 13:01:56 2022
@@ -209,54 +209,52 @@ SET(APR_SOURCES
user/win32/userinfo.c
)
-SET(APR_TEST_SOURCES
- test/abts.c
- test/testargs.c
- test/testatomic.c
- test/testcond.c
- test/testdir.c
- test/testdso.c
- test/testdup.c
- test/testenv.c
- test/testencode.c
- test/testescape.c
- test/testfile.c
- test/testfilecopy.c
- test/testfileinfo.c
- test/testflock.c
- test/testfmt.c
- test/testfnmatch.c
- test/testglobalmutex.c
- test/testhash.c
- test/testipsub.c
- test/testlfs.c
- test/testlock.c
- test/testmmap.c
- test/testnames.c
- test/testoc.c
- test/testpath.c
- test/testpipe.c
- test/testpoll.c
- test/testpools.c
- test/testproc.c
- test/testprocmutex.c
- test/testrand.c
- test/testshm.c
- test/testskiplist.c
- test/testsleep.c
- test/testsock.c
- test/testsockets.c
- test/testsockopt.c
- test/teststr.c
- test/teststrnatcmp.c
- test/testtable.c
- test/testtemp.c
- test/testthread.c
- test/testtime.c
- test/testud.c
- test/testuser.c
- test/testutil.c
- test/testvsn.c
+SET(APR_TEST_SUITES
+ testargs
+ testatomic
+ testcond
+ testdir
+ testdso
+ testdup
+ testenv
+ testencode
+ testescape
+ testfile
+ testfilecopy
+ testfileinfo
+ testflock
+ testfmt
+ testfnmatch
+ testglobalmutex
+ testhash
+ testipsub
+ testlfs
+ testlock
+ testmmap
+ testnames
+ testoc
+ testpath
+ testpipe
+ testpoll
+ testpools
+ testproc
+ testprocmutex
+ testrand
+ testshm
+ testskiplist
+ testsleep
+ testsock
+ testsockets
+ testsockopt
+ teststr
+ teststrnatcmp
+ testtable
+ testtemp
+ testthread
+ testtime
+ testud
+ testuser
+ testvsn
)
SET(install_targets)
@@ -318,12 +316,24 @@ IF(APR_BUILD_TESTAPR)
ENDIF()
ADD_TEST(NAME testapp COMMAND testapp)
+ SET (APR_TEST_SOURCES
+ test/abts.c
+ test/testutil.c
+ )
+
+ FOREACH(testsuite ${APR_TEST_SUITES})
+ LIST(APPEND APR_TEST_SOURCES test/${testsuite}.c)
+ ENDFOREACH()
+
ADD_EXECUTABLE(testall ${APR_TEST_SOURCES})
TARGET_LINK_LIBRARIES(testall ${whichapr} ${APR_SYSTEM_LIBS})
IF(apiflag)
SET_TARGET_PROPERTIES(testall PROPERTIES COMPILE_FLAGS ${apiflag})
ENDIF()
- ADD_TEST(NAME testall COMMAND testall)
+
+ FOREACH(test ${APR_TEST_SUITES})
+ ADD_TEST(NAME ${test} COMMAND testall ${test})
+ ENDFOREACH()
ADD_LIBRARY(mod_test MODULE test/mod_test.c)
TARGET_LINK_LIBRARIES(mod_test ${whichapr} ${APR_SYSTEM_LIBS})