sewardj | 452fba8 | 2006-07-06 01:54:34 +0000 | [diff] [blame] | 1 | Only in posixtestsuite/conformance/interfaces/pthread_spin_lock: 1-1 |
| 2 | diff -U3 -r posixtestsuite.orig/conformance/interfaces/pthread_spin_lock/1-1.c posixtestsuite/conformance/interfaces/pthread_spin_lock/1-1.c |
| 3 | --- posixtestsuite.orig/conformance/interfaces/pthread_spin_lock/1-1.c 2003-07-10 02:19:34.000000000 +0100 |
| 4 | +++ posixtestsuite/conformance/interfaces/pthread_spin_lock/1-1.c 2006-07-05 15:38:27.000000000 +0100 |
| 5 | @@ -39,7 +39,8 @@ |
| 6 | static void sig_handler() |
| 7 | { |
| 8 | /* Just return */ |
| 9 | - pthread_exit(0); |
| 10 | + /* pthread_exit(0); */ |
| 11 | + exit(0); |
| 12 | return; |
| 13 | } |
| 14 | |
| 15 | diff -U3 -r posixtestsuite.orig/LDFLAGS posixtestsuite/LDFLAGS |
| 16 | --- posixtestsuite.orig/LDFLAGS 2005-06-03 02:32:42.000000000 +0100 |
| 17 | +++ posixtestsuite/LDFLAGS 2006-07-05 13:03:09.000000000 +0100 |
| 18 | @@ -8,7 +8,7 @@ |
| 19 | #-lpthread -D_GNU_SOURCE |
| 20 | # |
| 21 | #Recommended flags: |
| 22 | -#-D_XOPEN_SOURCE=600 -lpthread -lrt -lm |
| 23 | +-D_XOPEN_SOURCE=600 -lpthread -lrt -lm |
| 24 | # |
| 25 | # For use with Linux, you may try the following flags to |
| 26 | # allow for the NPTL-specific compilation (used in some test cases) |
| 27 | diff -U3 -r posixtestsuite.orig/locate-test posixtestsuite/locate-test |
| 28 | --- posixtestsuite.orig/locate-test 2005-03-14 13:53:50.000000000 +0000 |
| 29 | +++ posixtestsuite/locate-test 2006-07-05 13:16:52.000000000 +0100 |
| 30 | @@ -60,19 +60,19 @@ |
| 31 | shift; |
| 32 | ;; |
| 33 | "--fmake") |
| 34 | - find functional/ -type f -maxdepth 2 -mindepth 2 -name "Makefile" -exec dirname '{}' ';' |
| 35 | + find functional/ -maxdepth 2 -mindepth 2 -type f -name "Makefile" -exec dirname '{}' ';' |
| 36 | exit 0; |
| 37 | ;; |
| 38 | "--frun") |
| 39 | - find functional/ -type f -maxdepth 2 -mindepth 2 -name "run.sh" -exec dirname '{}' ';' |
| 40 | + find functional/ -maxdepth 2 -mindepth 2 -type f -name "run.sh" -exec dirname '{}' ';' |
| 41 | exit 0; |
| 42 | ;; |
| 43 | "--smake") |
| 44 | - find stress/ -type f -maxdepth 2 -mindepth 2 -name "Makefile" -exec dirname '{}' ';' |
| 45 | + find stress/ -maxdepth 2 -mindepth 2 -type f -name "Makefile" -exec dirname '{}' ';' |
| 46 | exit 0; |
| 47 | ;; |
| 48 | "--srun") |
| 49 | - find stress/ -type f -maxdepth 2 -mindepth 2 -name "run.sh" -exec dirname '{}' ';' |
| 50 | + find stress/ -maxdepth 2 -mindepth 2 -type f -name "run.sh" -exec dirname '{}' ';' |
| 51 | exit 0; |
| 52 | ;; |
| 53 | "--help") |
| 54 | diff -U3 -r posixtestsuite.orig/Makefile posixtestsuite/Makefile |
| 55 | --- posixtestsuite.orig/Makefile 2005-03-14 13:53:41.000000000 +0000 |
| 56 | +++ posixtestsuite/Makefile 2006-07-05 16:28:57.000000000 +0100 |
| 57 | @@ -19,7 +19,7 @@ |
| 58 | |
| 59 | # Added tests timeout from Sebastien Decugis (http://nptl.bullopensource.org) |
| 60 | # Expiration delay is 120 seconds |
| 61 | -TIMEOUT_VAL = 120 |
| 62 | +TIMEOUT_VAL = 15 |
| 63 | # The following value is the shell return value of a timedout application. |
| 64 | # with the bash shell, the ret val of a killed application is 128 + signum |
| 65 | # and under Linux, SIGALRM=14, so we have (Linux+bash) 142. |
| 66 | @@ -99,7 +99,8 @@ |
| 67 | %.run-test: %.test $(top_builddir)/t0 |
| 68 | @COMPLOG=$(LOGFILE).$$$$; \ |
| 69 | [ -f $< ] || exit 0; \ |
| 70 | - $(TIMEOUT) $< > $$COMPLOG 2>&1; \ |
| 71 | + echo "$(@:.run-test=): GRIND=$(GRIND)" | tee -a $(LOGFILE); \ |
| 72 | + $(TIMEOUT) $(GRIND) $< > $$COMPLOG 2>&1; \ |
| 73 | RESULT=$$?; \ |
| 74 | if [ $$RESULT -eq 1 ]; \ |
| 75 | then \ |
| 76 | @@ -141,11 +142,12 @@ |
| 77 | @echo Building timeout helper files; \ |
| 78 | $(CC) -O2 -o $@ $< ; \ |
| 79 | echo `$(top_builddir)/t0 0; echo $$?` > $(top_builddir)/t0.val |
| 80 | - |
| 81 | + |
| 82 | %.run-test: %.sh $(top_builddir)/t0 |
| 83 | @COMPLOG=$(LOGFILE).$$$$; \ |
| 84 | + echo "$(@:.run-test=): GRIND=$(GRIND)" | tee -a $(LOGFILE); \ |
| 85 | chmod +x $<; \ |
| 86 | - $(TIMEOUT) $< > $$COMPLOG 2>&1; \ |
| 87 | + $(TIMEOUT) $(GRIND) $< > $$COMPLOG 2>&1; \ |
| 88 | RESULT=$$?; \ |
| 89 | if [ $$RESULT -eq 0 ]; \ |
| 90 | then \ |
| 91 | diff -U3 -r posixtestsuite.orig/run_tests posixtestsuite/run_tests |
| 92 | --- posixtestsuite.orig/run_tests 2004-12-16 09:56:18.000000000 +0000 |
| 93 | +++ posixtestsuite/run_tests 2006-07-05 19:06:48.000000000 +0100 |
| 94 | @@ -12,11 +12,14 @@ |
| 95 | usage() |
| 96 | { |
| 97 | cat <<EOF |
| 98 | -Usage: $0 [AIO|MEM|MSG|SEM|SIG|THR|TMR|TPS] |
| 99 | +Usage: $0 [AIO|MEM|MSG|SEM|SIG|THR|TMR|TPS |ALL] |
| 100 | |
| 101 | Build and run the tests for POSIX area specified by the 3 letter tag |
| 102 | in the POSIX spec |
| 103 | |
| 104 | +Optionally, set env variable GRIND to be the Valgrind and args used |
| 105 | +to run the tests (eg, GRIND="vTRUNK --tool=none"). |
| 106 | + |
| 107 | EOF |
| 108 | } |
| 109 | |
| 110 | @@ -64,6 +67,39 @@ |
| 111 | runtests "$BASEDIR/m*map" |
| 112 | runtests "$BASEDIR/shm_*" |
| 113 | ;; |
| 114 | + |
| 115 | + |
| 116 | + ALL) echo "Executing all tests" |
| 117 | + echo "Executing asynchronous I/O tests" |
| 118 | + runtests "$BASEDIR/aio_*" |
| 119 | + runtests "$BASEDIR/lio_listio" |
| 120 | + echo "Executing signals tests" |
| 121 | + runtests "$BASEDIR/sig*" |
| 122 | + runtests $BASEDIR/raise |
| 123 | + runtests $BASEDIR/kill |
| 124 | + runtests $BASEDIR/killpg |
| 125 | + runtests $BASEDIR/pthread_kill |
| 126 | + runtests $BASEDIR/pthread_sigmask |
| 127 | + echo "Executing semaphores tests" |
| 128 | + runtests "$BASEDIR/sem*" |
| 129 | + echo "Executing threads tests" |
| 130 | + runtests "$BASEDIR/pthread_*" |
| 131 | + echo "Executing timers and clocks tests" |
| 132 | + runtests "$BASEDIR/time*" |
| 133 | + runtests "$BASEDIR/*time" |
| 134 | + runtests "$BASEDIR/clock*" |
| 135 | + runtests $BASEDIR/nanosleep |
| 136 | + echo "Executing message queues tests" |
| 137 | + runtests "$BASEDIR/mq_*" |
| 138 | + echo "Executing process and thread scheduling tests" |
| 139 | + runtests "$BASEDIR/*sched*" |
| 140 | + echo "Executing mapped, process and shared memory tests" |
| 141 | + runtests "$BASEDIR/m*lock*" |
| 142 | + runtests "$BASEDIR/m*map" |
| 143 | + runtests "$BASEDIR/shm_*" |
| 144 | + ;; |
| 145 | + |
| 146 | + |
| 147 | *) usage |
| 148 | exit 1 |
| 149 | ;; |