From 088fb3cd473f49046d4a432ea44bdba59e5d081a Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 15 Apr 2008 16:54:40 +0000 Subject: [PATCH] * Created OptionalTestPackages for optional packages that contain test suites and the like, and moved the image jam code for PosixTestSuite and libMicro there. * Some cleanup (line length, use grist). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24970 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 80 +--------------------------------- build/jam/OptionalTestPackages | 80 ++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 79 deletions(-) create mode 100644 build/jam/OptionalTestPackages diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 9340026160..c296749b85 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -431,89 +431,11 @@ AddDirectoryToHaikuImage home config settings printers "Save as PDF" : home-config-settings-printers-save-as-pdf.rdef ; -#pragma mark - Tests - -# PosixTestSuite -if $(HAIKU_ADD_POSIX_TEST_SUITE_TO_IMAGE) { - # add run script - AddFilesToHaikuImage home posixtestsuite : run_posix_tests ; - - # add standard posix tests - AddFilesToHaikuImage home posixtestsuite conformance interfaces difftime - : difftime_1-1 ; - AddFilesToHaikuImage home posixtestsuite conformance interfaces fork - : fork_3-1 fork_4-1 fork_6-1 fork_8-1 fork_9-1 fork_12-1 ; - - # add signal posix tests - AddFilesToHaikuImage home posixtestsuite conformance interfaces kill - : kill_2-1 ; - AddFilesToHaikuImage home posixtestsuite conformance interfaces sighold - : sighold_1-1 sighold_2-1 sighold_3-core-buildonly ; - AddFilesToHaikuImage home posixtestsuite conformance interfaces sigignore - : sigignore_1-1 sigignore_4-1 sigignore_5-core-buildonly - sigignore_6-1 sigignore_6-2 ; - AddFilesToHaikuImage home posixtestsuite conformance interfaces sigprocmask - : sigprocmask_8-1 sigprocmask_8-2 sigprocmask_8-3 sigprocmask_12-1 ; - AddFilesToHaikuImage home posixtestsuite conformance interfaces sigrelse - : sigrelse_1-1 sigrelse_2-1 sigrelse_3-core-buildonly ; - AddFilesToHaikuImage home posixtestsuite conformance interfaces signal - : signal_1-1 signal_2-1 signal_3-1 signal_5-1 signal_6-1 signal_7-1 ; - AddFilesToHaikuImage home posixtestsuite conformance interfaces sigset - : sigset_1-1 sigset_2-1 sigset_3-1 sigset_4-1 sigset_5-1 sigset_6-1 - sigset_7-1 sigset_8-1 sigset_9-1 sigset_10-1 ; - - # add pthreads tests - AddFilesToHaikuImage home posixtestsuite conformance interfaces pthread_getspecific - : pthread_getspecific_1-1 pthread_getspecific_3-1 ; - AddFilesToHaikuImage home posixtestsuite conformance interfaces pthread_key_create - : pthread_key_create_1-1 pthread_key_create_1-2 pthread_key_create_2-1 - pthread_key_create_3-1 ; - AddFilesToHaikuImage home posixtestsuite conformance interfaces pthread_key_delete - : pthread_key_delete_1-1 pthread_key_delete_1-2 pthread_key_delete_2-1 ; - AddFilesToHaikuImage home posixtestsuite conformance interfaces pthread_once - : pthread_once_1-1 pthread_once_1-2 pthread_once_1-3 pthread_once_2-1 ; - AddFilesToHaikuImage home posixtestsuite conformance interfaces pthread_setspecific - : pthread_setspecific_1-1 pthread_setspecific_1-2 ; -} - - -#pragma mark - Benchmarks - - -# libMicro -if $(HAIKU_ADD_LIBMICRO_BENCHMARKS_TO_IMAGE) { - # add scripts, tattle executable and README - SEARCH on bench = [ FDirName $(HAIKU_TOP) src tests system benchmarks libMicro ] ; - AddFilesToHaikuImage home benchmarks libmicro : bench ; - SEARCH on multiview = [ FDirName $(HAIKU_TOP) src tests system benchmarks libMicro ] ; - AddFilesToHaikuImage home benchmarks libmicro : multiview ; - AddFilesToHaikuImage home benchmarks libmicro bin-BePC : tattle ; - SEARCH on README = [ FDirName $(HAIKU_TOP) src tests system benchmarks libMicro ] ; - AddFilesToHaikuImage home benchmarks libmicro : README ; - - - # add libmicro benchmarks - AddFilesToHaikuImage home benchmarks libmicro bin-BePC - : atomic bind cachetocache cascade_cond cascade_fcntl cascade_flock - cascade_lockf cascade_mutex chdir close close_tcp connection dup exec exec_bin - exit exp fcntl fcntl_ndelay file_lock fork getcontext getenv getpeername - getpid getrusage getsockname gettimeofday isatty listen localtime_r log - longjmp lrand48 lseek malloc memcpy memmove memrand memset mktime mmap mprotect - msync munmap mutex nop open pipe poll pread pthread_create pwrite read - realpath recurse select semop setcontext setsockopt sigaction siglongjmp signal - sigprocmask socket socketpair stat strcasecmp strchr strcmp - strcpy strftime strlen strtol system time times write writev ; - - AddSymlinkToHaikuImage home benchmarks libmicro : bin-BePC : bin ; - -} - - - #pragma mark - Optional Packages include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackages ] ; +include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalTestPackages ] ; #pragma mark - User/Group Setup diff --git a/build/jam/OptionalTestPackages b/build/jam/OptionalTestPackages new file mode 100644 index 0000000000..29071a1fd3 --- /dev/null +++ b/build/jam/OptionalTestPackages @@ -0,0 +1,80 @@ +# This file defines the optional packages containing tests of all kinds that can +# be added to the Haiku image. It is directly included from HaikuImage -- all +# variables defined there can be used + +# Available Optional Test Packages: +# libMicro +# PosixTestSuite + + +# libMicro +if [ IsOptionalHaikuImagePackageAdded libMicro ] { + # add scripts, tattle executable and README + SEARCH on bench multiview README + = [ FDirName $(HAIKU_TOP) src tests system benchmarks libMicro ] ; + + AddFilesToHaikuImage home benchmarks libmicro + : bench multiview README ; + AddFilesToHaikuImage home benchmarks libmicro bin-BePC : tattle ; + + # add libmicro benchmarks + AddFilesToHaikuImage home benchmarks libmicro bin-BePC : + atomic bind cachetocache cascade_cond cascade_fcntl + cascade_flock cascade_lockf cascade_mutex chdir close close_tcp + connection dup exec exec_bin exit exp fcntl fcntl_ndelay file_lock fork + getcontext getenv getpeername getpid getrusage getsockname + gettimeofday isatty listen localtime_r log longjmp lrand48 + lseek malloc memcpy memmove memrand memset mktime mmap mprotect msync + munmap mutex nop open pipe poll pread pthread_create pwrite + read realpath recurse select semop setcontext setsockopt sigaction + siglongjmp signal sigprocmask socket socketpair stat + strcasecmp strchr strcmp strcpy strftime strlen strtol system time times + write writev ; + + AddSymlinkToHaikuImage home benchmarks libmicro : bin-BePC : bin ; +} + + +# PosixTestSuite +if [ IsOptionalHaikuImagePackageAdded PosixTestSuite ] { + # add run script + AddFilesToHaikuImage home posixtestsuite : run_posix_tests ; + + # add standard posix tests + AddFilesToHaikuImage home posixtestsuite conformance interfaces difftime + : difftime_1-1 ; + AddFilesToHaikuImage home posixtestsuite conformance interfaces fork + : fork_3-1 fork_4-1 fork_6-1 fork_8-1 fork_9-1 fork_12-1 ; + + # add signal posix tests + AddFilesToHaikuImage home posixtestsuite conformance interfaces kill + : kill_2-1 ; + AddFilesToHaikuImage home posixtestsuite conformance interfaces sighold + : sighold_1-1 sighold_2-1 sighold_3-core-buildonly ; + AddFilesToHaikuImage home posixtestsuite conformance interfaces sigignore + : sigignore_1-1 sigignore_4-1 sigignore_5-core-buildonly + sigignore_6-1 sigignore_6-2 ; + AddFilesToHaikuImage home posixtestsuite conformance interfaces sigprocmask + : sigprocmask_8-1 sigprocmask_8-2 sigprocmask_8-3 sigprocmask_12-1 ; + AddFilesToHaikuImage home posixtestsuite conformance interfaces sigrelse + : sigrelse_1-1 sigrelse_2-1 sigrelse_3-core-buildonly ; + AddFilesToHaikuImage home posixtestsuite conformance interfaces signal + : signal_1-1 signal_2-1 signal_3-1 signal_5-1 signal_6-1 signal_7-1 ; + AddFilesToHaikuImage home posixtestsuite conformance interfaces sigset + : sigset_1-1 sigset_2-1 sigset_3-1 sigset_4-1 sigset_5-1 sigset_6-1 + sigset_7-1 sigset_8-1 sigset_9-1 sigset_10-1 ; + + # add pthreads tests + local interfacesDir = home posixtestsuite conformance interfaces ; + AddFilesToHaikuImage $(interfacesDir) pthread_getspecific + : pthread_getspecific_1-1 pthread_getspecific_3-1 ; + AddFilesToHaikuImage $(interfacesDir) pthread_key_create + : pthread_key_create_1-1 pthread_key_create_1-2 pthread_key_create_2-1 + pthread_key_create_3-1 ; + AddFilesToHaikuImage $(interfacesDir) pthread_key_delete + : pthread_key_delete_1-1 pthread_key_delete_1-2 pthread_key_delete_2-1 ; + AddFilesToHaikuImage $(interfacesDir) pthread_once + : pthread_once_1-1 pthread_once_1-2 pthread_once_1-3 pthread_once_2-1 ; + AddFilesToHaikuImage $(interfacesDir) pthread_setspecific + : pthread_setspecific_1-1 pthread_setspecific_1-2 ; +}