From: Garrett C. <ris...@li...> - 2010-07-04 20:34:17
|
The branch, pu, has been updated via 99602c3e4b4d6de4c85c7ffaff206116c59480ce (commit) via 70c91766d2a044c1bb78584238e5224da33381f9 (commit) via 91f8b2ffe2984e032bb60ce39bb8b0405e19fcb9 (commit) via f7049d007a5595187c8b523ba2831232abbfeddd (commit) from 038138be7d47a1b38cf44baa7d30e8ed0c700d3e (commit) - Log ----------------------------------------------------------------- commit 99602c3e4b4d6de4c85c7ffaff206116c59480ce Author: Garrett Cooper <yan...@gm...> Date: Sun Jul 4 13:31:35 2010 -0700 Prune away testfrmw.c until it's put in a library. Signed-off-by: Garrett Cooper <yan...@gm...> commit 70c91766d2a044c1bb78584238e5224da33381f9 Author: Garrett Cooper <yan...@gm...> Date: Sun Jul 4 13:30:45 2010 -0700 Fix extension. Signed-off-by: Garrett Cooper <yan...@gm...> commit 91f8b2ffe2984e032bb60ce39bb8b0405e19fcb9 Author: Garrett Cooper <yan...@gm...> Date: Sun Jul 4 13:20:22 2010 -0700 Correctly catagorize build tests. Signed-off-by: Garrett Cooper <yan...@gm...> commit f7049d007a5595187c8b523ba2831232abbfeddd Author: Garrett Cooper <yan...@gm...> Date: Sun Jul 4 13:14:22 2010 -0700 Quiet down make operations; force compile to -j1. The -j1 requirement is necessary so it doesn't create a ton of truncated / incorrect noise in the log output. This might need to be tuned later once a better system of dealing with errors is properly devised. Signed-off-by: Garrett Cooper <yan...@gm...> ----------------------------------------------------------------------- Summary of changes: testcases/open_posix_testsuite/Makefile | 37 +++++++++++--------- .../open_posix_testsuite/conformance/Makefile | 4 +- .../pthread_h/{1-1.c => 1-1-buildonly.c} | 0 .../definitions/pthread_h/{10.c => 10-buildonly.c} | 0 .../pthread_h/{11-1.c => 11-1-buildonly.c} | 0 .../pthread_h/{12-1.c => 12-1-buildonly.c} | 0 .../pthread_h/{13-1.c => 13-1-buildonly.c} | 0 .../pthread_h/{14-1.c => 14-1-buildonly.c} | 0 .../pthread_h/{15-1.c => 15-1-buildonly.c} | 0 .../pthread_h/{16-1.c => 16-1-buildonly.c} | 0 .../pthread_h/{17-1.c => 17-1-buildonly.c} | 0 .../pthread_h/{18-1.c => 18-1-buildonly.c} | 0 .../pthread_h/{19-1.c => 19-1-buildonly.c} | 0 .../pthread_h/{2-1.c => 2-1-buildonly.c} | 0 .../pthread_h/{2-2.c => 2-2-buildonly.c} | 0 .../pthread_h/{20-1.c => 20-1-buildonly.c} | 0 .../pthread_h/{3-1.c => 3-1-buildonly.c} | 0 .../pthread_h/{3-10.c => 3-10-buildonly.c} | 0 .../pthread_h/{3-11.c => 3-11-buildonly.c} | 0 .../pthread_h/{3-12.c => 3-12-buildonly.c} | 0 .../pthread_h/{3-13.c => 3-13-buildonly.c} | 0 .../pthread_h/{3-2.c => 3-2-buildonly.c} | 0 .../pthread_h/{3-3.c => 3-3-buildonly.c} | 0 .../pthread_h/{3-4.c => 3-4-buildonly.c} | 0 .../pthread_h/{3-5.c => 3-5-buildonly.c} | 0 .../pthread_h/{3-6.c => 3-6-buildonly.c} | 0 .../pthread_h/{3-7.c => 3-7-buildonly.c} | 0 .../pthread_h/{3-8.c => 3-8-buildonly.c} | 0 .../pthread_h/{3-9.c => 3-9-buildonly.c} | 0 .../pthread_h/{4-1.c => 4-1-buildonly.c} | 0 .../pthread_h/{5-1.c => 5-1-buildonly.c} | 0 .../pthread_h/{6-1.c => 6-1-buildonly.c} | 0 .../pthread_h/{7-1.c => 7-1-buildonly.c} | 0 .../pthread_h/{8-1.c => 8-1-buildonly.c} | 0 .../pthread_h/{9-1.c => 9-1-buildonly.c} | 0 .../definitions/sched_h/{1-1.c => 1-1-buildonly.c} | 0 .../sched_h/{11-1.c => 11-1-buildonly.c} | 0 .../sched_h/{12-1.c => 12-1-buildonly.c} | 0 .../sched_h/{13-1.c => 13-1-buildonly.c} | 0 .../sched_h/{14-1.c => 14-1-buildonly.c} | 0 .../sched_h/{15-1.c => 15-1-buildonly.c} | 0 .../sched_h/{16-1.c => 16-1-buildonly.c} | 0 .../sched_h/{17-1.c => 17-1-buildonly.c} | 0 .../sched_h/{18-1.c => 18-1-buildonly.c} | 0 .../sched_h/{19-1.c => 19-1-buildonly.c} | 0 .../definitions/sched_h/{2-1.c => 2-1-buildonly.c} | 0 .../definitions/sched_h/{3-1.c => 3-1-buildonly.c} | 0 .../definitions/sched_h/{4-1.c => 4-1-buildonly.c} | 0 .../definitions/sched_h/{8-1.c => 8-1-buildonly.c} | 0 .../definitions/sched_h/{8-2.c => 8-2-buildonly.c} | 0 .../definitions/sched_h/{8-3.c => 8-3-buildonly.c} | 0 .../definitions/sched_h/{8-4.c => 8-4-buildonly.c} | 0 .../interfaces/pthread_create/testfrmw.c | 4 ++- .../sem_getvalue/{coverage.c => coverage.txt} | 0 .../conformance/interfaces/sigaddset/4-1.sh | 2 +- .../conformance/interfaces/sigaddset/4-2.sh | 2 +- .../conformance/interfaces/sigaddset/4-3.sh | 2 +- .../conformance/interfaces/sigaddset/4-4.sh | 2 +- .../conformance/interfaces/sigaddset/4-core.c | 4 +- testcases/open_posix_testsuite/functional/Makefile | 4 +- .../functional/threads/Makefile | 4 +- .../scripts/generate-makefiles.sh | 3 ++ testcases/open_posix_testsuite/scripts/locate-test | 5 ++- testcases/open_posix_testsuite/stress/Makefile | 2 +- 64 files changed, 43 insertions(+), 32 deletions(-) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{1-1.c => 1-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{10.c => 10-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{11-1.c => 11-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{12-1.c => 12-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{13-1.c => 13-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{14-1.c => 14-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{15-1.c => 15-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{16-1.c => 16-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{17-1.c => 17-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{18-1.c => 18-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{19-1.c => 19-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{2-1.c => 2-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{2-2.c => 2-2-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{20-1.c => 20-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{3-1.c => 3-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{3-10.c => 3-10-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{3-11.c => 3-11-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{3-12.c => 3-12-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{3-13.c => 3-13-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{3-2.c => 3-2-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{3-3.c => 3-3-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{3-4.c => 3-4-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{3-5.c => 3-5-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{3-6.c => 3-6-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{3-7.c => 3-7-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{3-8.c => 3-8-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{3-9.c => 3-9-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{4-1.c => 4-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{5-1.c => 5-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{6-1.c => 6-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{7-1.c => 7-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{8-1.c => 8-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/pthread_h/{9-1.c => 9-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/sched_h/{1-1.c => 1-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/sched_h/{11-1.c => 11-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/sched_h/{12-1.c => 12-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/sched_h/{13-1.c => 13-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/sched_h/{14-1.c => 14-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/sched_h/{15-1.c => 15-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/sched_h/{16-1.c => 16-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/sched_h/{17-1.c => 17-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/sched_h/{18-1.c => 18-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/sched_h/{19-1.c => 19-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/sched_h/{2-1.c => 2-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/sched_h/{3-1.c => 3-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/sched_h/{4-1.c => 4-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/sched_h/{8-1.c => 8-1-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/sched_h/{8-2.c => 8-2-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/sched_h/{8-3.c => 8-3-buildonly.c} (100%) rename testcases/open_posix_testsuite/conformance/definitions/sched_h/{8-4.c => 8-4-buildonly.c} (100%) copy testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/{coverage.c => coverage.txt} (100%) diff --git a/testcases/open_posix_testsuite/Makefile b/testcases/open_posix_testsuite/Makefile index b926df1..24e3d9b 100644 --- a/testcases/open_posix_testsuite/Makefile +++ b/testcases/open_posix_testsuite/Makefile @@ -31,6 +31,9 @@ CFLAGS+= `$(CC) -std=c99 -S -o /dev/null -xc /dev/null >/dev/null 2>&1 && echo CFLAGS+= `$(CC) -std=gnu99 -S -o /dev/null -xc /dev/null >/dev/null 2>&1 && echo "-std=gnu99"` CFLAGS+= -D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=600 +# Force to -j1 so the output in the logfile won't be wonky. +MAKE+= -j1 LOGFILE=`if echo "$(LOGFILE)" | grep -q '^/'; then echo "$(LOGFILE)"; else echo "\`pwd\`/$(LOGFILE)"; fi`.$@ + #LDFLAGS+= #LDLIBS+= -lpthread -lrt -lm @@ -39,16 +42,16 @@ top_srcdir?= . all: conformance-all functional-all stress-all tools clean: - rm -f $(LOGFILE)* - for d in $(SUBDIRS) tools; do \ - $(MAKE) -C $$d clean >/dev/null; \ + @rm -f $(LOGFILE)* + @for dir in $(SUBDIRS) tools; do \ + $(MAKE) -C $$dir clean >/dev/null; \ done # Clean out all of the generated Makefiles; this is done this way to ensure # there won't be an argument overflow, and to remain POSIXly correct (POSIX # find(1) doesn't support -mindepth like BSD and GNU find do...). distclean-makefiles: - for dir in $(SUBDIRS); do \ + @for dir in $(SUBDIRS); do \ (cd $$dir && for subdir in */; do \ (cd $$subdir && find */ -name Makefile 2>/dev/null | xargs rm -f); \ done); \ @@ -64,30 +67,30 @@ $(CRITICAL_MAKEFILES): scripts/generate-makefiles.sh tools: @$(MAKE) -C tools all -tools/t0: $(srcdir)/tools/t0.c - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(srcdir)/$(@F) $(LDLIBS) - -#build/t0.val: build/t0 -# echo `./t0 0; echo $$?` > t0.val - # Test build and execution targets. conformance-all: $(CRITICAL_CONFORMANCE_MAKEFILE) - $(MAKE) -C conformance all + @rm -f `if echo "$(LOGFILE)" | grep -q '^/'; then echo "$(LOGFILE)"; else echo "\`pwd\`/$(LOGFILE)"; fi`.$@ + @$(MAKE) -C conformance all conformance-test: - $(MAKE) -C conformance all + @rm -f `if echo "$(LOGFILE)" | grep -q '^/'; then echo "$(LOGFILE)"; else echo "\`pwd\`/$(LOGFILE)"; fi`.$@ + @$(MAKE) -C conformance test functional-all: $(CRITICAL_FUNCTIONAL_MAKEFILE) - $(MAKE) -C functional all + @rm -f `if echo "$(LOGFILE)" | grep -q '^/'; then echo "$(LOGFILE)"; else echo "\`pwd\`/$(LOGFILE)"; fi`.$@ + @$(MAKE) -C functional all functional-test: - $(MAKE) -C functional test + @rm -f `if echo "$(LOGFILE)" | grep -q '^/'; then echo "$(LOGFILE)"; else echo "\`pwd\`/$(LOGFILE)"; fi`.$@ + @$(MAKE) -C functional test stress-all: $(CRITICAL_STRESS_MAKEFILE) - $(MAKE) -C stress all + @rm -f `if echo "$(LOGFILE)" | grep -q '^/'; then echo "$(LOGFILE)"; else echo "\`pwd\`/$(LOGFILE)"; fi`.$@ + @$(MAKE) -C stress all stress-test: - $(MAKE) -C stress test + @rm -f `if echo "$(LOGFILE)" | grep -q '^/'; then echo "$(LOGFILE)"; else echo "\`pwd\`/$(LOGFILE)"; fi`.$@ + @$(MAKE) -C stress test tests-pretty: - $(MAKE) all | column -t -s: + @$(MAKE) all | column -t -s: diff --git a/testcases/open_posix_testsuite/conformance/Makefile b/testcases/open_posix_testsuite/conformance/Makefile index 1b70252..e67c7cf 100644 --- a/testcases/open_posix_testsuite/conformance/Makefile +++ b/testcases/open_posix_testsuite/conformance/Makefile @@ -5,6 +5,6 @@ # all clean install test: - for dir in `ls -d */Makefile 2>/dev/null | sed -e 's,/Makefile$$,,g'`; do \ - $(MAKE) -C $$dir $@; \ + @for dir in `ls -d */Makefile 2>/dev/null | sed -e 's,/Makefile$$,,g'`; do \ + $(MAKE) -C $$dir $@; \ done diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/1-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/1-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/1-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/1-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/10.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/10-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/10.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/10-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/11-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/11-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/11-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/11-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/12-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/12-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/12-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/12-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/13-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/13-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/13-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/13-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/14-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/14-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/14-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/14-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/15-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/15-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/15-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/15-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/16-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/16-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/16-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/16-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/17-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/17-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/17-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/17-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/18-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/18-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/18-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/18-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/19-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/19-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/19-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/19-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/2-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/2-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/2-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/2-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/2-2.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/2-2-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/2-2.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/2-2-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/20-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/20-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/20-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/20-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-10.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-10-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-10.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-10-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-11.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-11-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-11.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-11-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-12.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-12-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-12.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-12-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-13.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-13-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-13.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-13-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-2.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-2-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-2.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-2-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-3.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-3-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-3.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-3-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-4.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-4-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-4.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-4-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-5.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-5-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-5.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-5-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-6.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-6-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-6.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-6-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-7.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-7-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-7.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-7-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-8.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-8-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-8.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-8-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-9.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-9-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-9.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/3-9-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/4-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/4-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/4-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/4-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/5-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/5-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/5-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/5-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/6-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/6-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/6-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/6-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/7-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/7-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/7-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/7-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/8-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/8-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/8-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/8-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/pthread_h/9-1.c b/testcases/open_posix_testsuite/conformance/definitions/pthread_h/9-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/pthread_h/9-1.c rename to testcases/open_posix_testsuite/conformance/definitions/pthread_h/9-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/sched_h/1-1.c b/testcases/open_posix_testsuite/conformance/definitions/sched_h/1-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/sched_h/1-1.c rename to testcases/open_posix_testsuite/conformance/definitions/sched_h/1-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/sched_h/11-1.c b/testcases/open_posix_testsuite/conformance/definitions/sched_h/11-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/sched_h/11-1.c rename to testcases/open_posix_testsuite/conformance/definitions/sched_h/11-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/sched_h/12-1.c b/testcases/open_posix_testsuite/conformance/definitions/sched_h/12-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/sched_h/12-1.c rename to testcases/open_posix_testsuite/conformance/definitions/sched_h/12-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/sched_h/13-1.c b/testcases/open_posix_testsuite/conformance/definitions/sched_h/13-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/sched_h/13-1.c rename to testcases/open_posix_testsuite/conformance/definitions/sched_h/13-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/sched_h/14-1.c b/testcases/open_posix_testsuite/conformance/definitions/sched_h/14-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/sched_h/14-1.c rename to testcases/open_posix_testsuite/conformance/definitions/sched_h/14-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/sched_h/15-1.c b/testcases/open_posix_testsuite/conformance/definitions/sched_h/15-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/sched_h/15-1.c rename to testcases/open_posix_testsuite/conformance/definitions/sched_h/15-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/sched_h/16-1.c b/testcases/open_posix_testsuite/conformance/definitions/sched_h/16-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/sched_h/16-1.c rename to testcases/open_posix_testsuite/conformance/definitions/sched_h/16-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/sched_h/17-1.c b/testcases/open_posix_testsuite/conformance/definitions/sched_h/17-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/sched_h/17-1.c rename to testcases/open_posix_testsuite/conformance/definitions/sched_h/17-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/sched_h/18-1.c b/testcases/open_posix_testsuite/conformance/definitions/sched_h/18-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/sched_h/18-1.c rename to testcases/open_posix_testsuite/conformance/definitions/sched_h/18-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/sched_h/19-1.c b/testcases/open_posix_testsuite/conformance/definitions/sched_h/19-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/sched_h/19-1.c rename to testcases/open_posix_testsuite/conformance/definitions/sched_h/19-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/sched_h/2-1.c b/testcases/open_posix_testsuite/conformance/definitions/sched_h/2-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/sched_h/2-1.c rename to testcases/open_posix_testsuite/conformance/definitions/sched_h/2-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/sched_h/3-1.c b/testcases/open_posix_testsuite/conformance/definitions/sched_h/3-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/sched_h/3-1.c rename to testcases/open_posix_testsuite/conformance/definitions/sched_h/3-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/sched_h/4-1.c b/testcases/open_posix_testsuite/conformance/definitions/sched_h/4-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/sched_h/4-1.c rename to testcases/open_posix_testsuite/conformance/definitions/sched_h/4-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/sched_h/8-1.c b/testcases/open_posix_testsuite/conformance/definitions/sched_h/8-1-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/sched_h/8-1.c rename to testcases/open_posix_testsuite/conformance/definitions/sched_h/8-1-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/sched_h/8-2.c b/testcases/open_posix_testsuite/conformance/definitions/sched_h/8-2-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/sched_h/8-2.c rename to testcases/open_posix_testsuite/conformance/definitions/sched_h/8-2-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/sched_h/8-3.c b/testcases/open_posix_testsuite/conformance/definitions/sched_h/8-3-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/sched_h/8-3.c rename to testcases/open_posix_testsuite/conformance/definitions/sched_h/8-3-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/definitions/sched_h/8-4.c b/testcases/open_posix_testsuite/conformance/definitions/sched_h/8-4-buildonly.c similarity index 100% rename from testcases/open_posix_testsuite/conformance/definitions/sched_h/8-4.c rename to testcases/open_posix_testsuite/conformance/definitions/sched_h/8-4-buildonly.c diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_create/testfrmw.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_create/testfrmw.c index 38adaa8..49ac749 100644 --- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_create/testfrmw.c +++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_create/testfrmw.c @@ -27,8 +27,10 @@ * The are used to output informative text (as a printf). */ -#include <time.h> #include <sys/types.h> +#include <stdarg.h> +#include <stdio.h> +#include <time.h> /* We use a mutex to avoid conflicts in traces */ static pthread_mutex_t m_trace = PTHREAD_MUTEX_INITIALIZER; diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/coverage.c b/testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/coverage.txt similarity index 100% copy from testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/coverage.c copy to testcases/open_posix_testsuite/conformance/interfaces/sem_getvalue/coverage.txt diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-1.sh b/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-1.sh index 0a91a60..cb29ca9 100755 --- a/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-1.sh +++ b/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-1.sh @@ -9,4 +9,4 @@ # Test various methods of adding invalid signals to sigaddset(). # -conformance/interfaces/sigaddset/4-core-buildonly.test 1 +conformance/interfaces/sigaddset/4-core.run-test 1 diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-2.sh b/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-2.sh index 1be5610..5ab480d 100755 --- a/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-2.sh +++ b/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-2.sh @@ -10,4 +10,4 @@ # Test various methods of adding invalid signals to sigaddset(). # -conformance/interfaces/sigaddset/4-core-buildonly.test 2 +conformance/interfaces/sigaddset/4-core.run-test 2 diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-3.sh b/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-3.sh index aca9df9..644512f 100755 --- a/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-3.sh +++ b/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-3.sh @@ -9,4 +9,4 @@ # Test various methods of adding invalid signals to sigaddset(). # -conformance/interfaces/sigaddset/4-core-buildonly.test 3 +conformance/interfaces/sigaddset/4-core.run-test 3 diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-4.sh b/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-4.sh index f178ef1..ca8523f 100755 --- a/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-4.sh +++ b/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-4.sh @@ -9,4 +9,4 @@ # Test various methods of adding invalid signals to sigaddset(). # -conformance/interfaces/sigaddset/4-core-buildonly.test 4 +conformance/interfaces/sigaddset/4-core.run-test 4 diff --git a/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-core.c b/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-core.c index 5a9243e..0c2b489 100644 --- a/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-core.c +++ b/testcases/open_posix_testsuite/conformance/interfaces/sigaddset/4-core.c @@ -13,9 +13,9 @@ 3) Verify that -1 is returned, the invalid signal is not a member of the signal set, and errno is set to indicate the error. */ -#include <stdio.h> -#include <signal.h> #include <errno.h> +#include <signal.h> +#include <stdio.h> #include <stdint.h> #include "posixtest.h" diff --git a/testcases/open_posix_testsuite/functional/Makefile b/testcases/open_posix_testsuite/functional/Makefile index 1b70252..e67c7cf 100644 --- a/testcases/open_posix_testsuite/functional/Makefile +++ b/testcases/open_posix_testsuite/functional/Makefile @@ -5,6 +5,6 @@ # all clean install test: - for dir in `ls -d */Makefile 2>/dev/null | sed -e 's,/Makefile$$,,g'`; do \ - $(MAKE) -C $$dir $@; \ + @for dir in `ls -d */Makefile 2>/dev/null | sed -e 's,/Makefile$$,,g'`; do \ + $(MAKE) -C $$dir $@; \ done diff --git a/testcases/open_posix_testsuite/functional/threads/Makefile b/testcases/open_posix_testsuite/functional/threads/Makefile index 1b70252..e67c7cf 100644 --- a/testcases/open_posix_testsuite/functional/threads/Makefile +++ b/testcases/open_posix_testsuite/functional/threads/Makefile @@ -5,6 +5,6 @@ # all clean install test: - for dir in `ls -d */Makefile 2>/dev/null | sed -e 's,/Makefile$$,,g'`; do \ - $(MAKE) -C $$dir $@; \ + @for dir in `ls -d */Makefile 2>/dev/null | sed -e 's,/Makefile$$,,g'`; do \ + $(MAKE) -C $$dir $@; \ done diff --git a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh index bd23d27..b194044 100755 --- a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh +++ b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh @@ -91,6 +91,9 @@ INSTALL_DIR= \$(DESTDIR)/\$(EXEC_PREFIX)/\$(subdir) # Build variables CFLAGS+= -I\$(top_srcdir)/include +# XXX: for testfrmw.c -- needs to be moved into a library. +CFLAGS+= -I\$(srcdir) + EOF for var in CFLAGS LDFLAGS LDLIBS; do diff --git a/testcases/open_posix_testsuite/scripts/locate-test b/testcases/open_posix_testsuite/scripts/locate-test index c5be6fe..ba3af22 100755 --- a/testcases/open_posix_testsuite/scripts/locate-test +++ b/testcases/open_posix_testsuite/scripts/locate-test @@ -87,6 +87,9 @@ runnable) # waltz down the tools directory and try and build t0 (which doesn't # make sense as it's a tool, not a test). Better criterion needs to # be established for this file. - find "$WHERE" -type f -name '*.c' -o -name '[0-9]*-[0-9]*.sh' | grep -v buildonly | grep -v '^./tools' + # XXX (garrcoop): remove all testfrmw files because there're actually + # used as includes in the make process; they really should be + # functions in a library. + find "$WHERE" -type f -name '*.c' -o -name '[0-9]*-[0-9]*.sh' | grep -v buildonly | grep -v '^./tools' | grep -v testfrmw ;; esac diff --git a/testcases/open_posix_testsuite/stress/Makefile b/testcases/open_posix_testsuite/stress/Makefile index 1b70252..5523b02 100644 --- a/testcases/open_posix_testsuite/stress/Makefile +++ b/testcases/open_posix_testsuite/stress/Makefile @@ -5,6 +5,6 @@ # all clean install test: - for dir in `ls -d */Makefile 2>/dev/null | sed -e 's,/Makefile$$,,g'`; do \ + @for dir in `ls -d */Makefile 2>/dev/null | sed -e 's,/Makefile$$,,g'`; do \ $(MAKE) -C $$dir $@; \ done hooks/post-receive -- ltp |