From 96e4b2231274429569cda56d965bcc11d8009800 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Wed, 6 Mar 2019 20:39:29 +1100 Subject: testsuite: Make the OPERATION_COUNT a test configuration parameter. - Add a small memory test config file. - Update the small memory PowerPC BSPs to use the new test config. --- testsuites/psxtmtests/Makefile.am | 165 ++++++++---------------- testsuites/psxtmtests/psxtmbarrier01/init.c | 4 + testsuites/psxtmtests/psxtmbarrier02/init.c | 8 +- testsuites/psxtmtests/psxtmbarrier03/init.c | 4 + testsuites/psxtmtests/psxtmbarrier04/init.c | 5 + testsuites/psxtmtests/psxtmbarrierattr01/init.c | 4 + testsuites/psxtmtests/psxtmcleanup01/init.c | 4 + testsuites/psxtmtests/psxtmcond08/init.c | 4 + testsuites/psxtmtests/psxtmmutex02/init.c | 6 +- testsuites/psxtmtests/psxtmmutex06/init.c | 6 +- testsuites/psxtmtests/psxtmsem03/init.c | 6 +- testsuites/psxtmtests/psxtmthread01/init.c | 6 +- 12 files changed, 106 insertions(+), 116 deletions(-) (limited to 'testsuites/psxtmtests') diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am index 1f22850ebf..88ee7f2495 100644 --- a/testsuites/psxtmtests/Makefile.am +++ b/testsuites/psxtmtests/Makefile.am @@ -20,8 +20,7 @@ psxtmbarrier01_SOURCES = psxtmbarrier01/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmbarrier01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmbarrier01) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmbarrier02 @@ -31,8 +30,7 @@ psxtmbarrier02_SOURCES = psxtmbarrier02/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmbarrier02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmbarrier02) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmbarrier03 @@ -42,8 +40,7 @@ psxtmbarrier03_SOURCES = psxtmbarrier03/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmbarrier03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmbarrier03) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmbarrier04 @@ -53,8 +50,7 @@ psxtmbarrier04_SOURCES = psxtmbarrier04/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmbarrier04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmbarrier04) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmbarrierattr01 @@ -64,8 +60,7 @@ psxtmbarrierattr01_SOURCES = psxtmbarrierattr01/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmbarrierattr01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmbarrierattr01) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmcleanup01 @@ -76,8 +71,7 @@ psxtmcleanup01_SOURCES = psxtmcleanup01/init.c \ ../support/src/tmtests_support.c psxtmcleanup01_CPPFLAGS = $(AM_CPPFLAGS) \ $(TEST_FLAGS_psxtmcleanup01) $(support_includes) \ - -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmclocknanosleep01 @@ -88,8 +82,7 @@ psxtmclocknanosleep01_SOURCES = psxtmclocknanosleep01/init.c \ ../support/src/tmtests_support.c psxtmclocknanosleep01_CPPFLAGS = $(AM_CPPFLAGS) \ $(TEST_FLAGS_psxtmclocknanosleep01) $(support_includes) \ - -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmclocknanosleep02 @@ -100,8 +93,7 @@ psxtmclocknanosleep02_SOURCES = psxtmclocknanosleep02/init.c \ ../support/src/tmtests_support.c psxtmclocknanosleep02_CPPFLAGS = $(AM_CPPFLAGS) \ $(TEST_FLAGS_psxtmclocknanosleep02) $(support_includes) \ - -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmclocknanosleep03 @@ -112,8 +104,7 @@ psxtmclocknanosleep03_SOURCES = psxtmclocknanosleep03/init.c \ ../support/src/tmtests_support.c psxtmclocknanosleep03_CPPFLAGS = $(AM_CPPFLAGS) \ $(TEST_FLAGS_psxtmclocknanosleep03) $(support_includes) \ - -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmcond01 @@ -123,8 +114,7 @@ psxtmcond01_SOURCES = psxtmcond01/init.c ../tmtests/include/timesys.h \ ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmcond01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond01) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmcond02 @@ -134,8 +124,7 @@ psxtmcond02_SOURCES = psxtmcond02/init.c ../tmtests/include/timesys.h \ ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmcond02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond02) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmcond03 @@ -145,8 +134,7 @@ psxtmcond03_SOURCES = psxtmcond03/init.c ../tmtests/include/timesys.h \ ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmcond03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond03) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmcond04 @@ -156,8 +144,7 @@ psxtmcond04_SOURCES = psxtmcond04/init.c ../tmtests/include/timesys.h \ ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmcond04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond04) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmcond05 @@ -167,8 +154,7 @@ psxtmcond05_SOURCES = psxtmcond05/init.c ../tmtests/include/timesys.h \ ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmcond05_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond05) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmcond06 @@ -178,8 +164,7 @@ psxtmcond06_SOURCES = psxtmcond06/init.c ../tmtests/include/timesys.h \ ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmcond06_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond06) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmcond07 @@ -189,8 +174,7 @@ psxtmcond07_SOURCES = psxtmcond07/init.c ../tmtests/include/timesys.h \ ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmcond07_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond07) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmcond08 @@ -200,8 +184,7 @@ psxtmcond08_SOURCES = psxtmcond08/init.c ../tmtests/include/timesys.h \ ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmcond08_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond08) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) -DUSE_WAIT + $(support_includes) -I$(top_srcdir)/../tmtests/include -DUSE_WAIT endif if TEST_psxtmcond09 @@ -212,7 +195,7 @@ psxtmcond09_SOURCES = psxtmcond08/init.c ../tmtests/include/timesys.h \ ../support/src/tmtests_support.c psxtmcond09_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond09) \ $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) -DUSE_TIMEDWAIT_WITH_VALUE + -DUSE_TIMEDWAIT_WITH_VALUE endif if TEST_psxtmcond10 @@ -223,7 +206,6 @@ psxtmcond10_SOURCES = psxtmcond08/init.c ../tmtests/include/timesys.h \ ../support/src/tmtests_support.c psxtmcond10_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmcond10) \ $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) \ -DUSE_TIMEDWAIT_WAIT_VALUE_IN_PAST endif @@ -234,8 +216,7 @@ psxtmkey01_SOURCES = psxtmkey01/init.c ../tmtests/include/timesys.h \ ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmkey01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmkey01) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmkey02 @@ -245,8 +226,7 @@ psxtmkey02_SOURCES = psxtmkey02/init.c ../tmtests/include/timesys.h \ ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmkey02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmkey02) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmmq01 @@ -256,8 +236,7 @@ psxtmmq01_SOURCES = psxtmmq01/init.c ../tmtests/include/timesys.h \ ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmmq01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmq01) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmmutex01 @@ -267,8 +246,7 @@ psxtmmutex01_SOURCES = psxtmmutex01/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmmutex01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmutex01) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmmutex02 @@ -278,8 +256,7 @@ psxtmmutex02_SOURCES = psxtmmutex02/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmmutex02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmutex02) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmmutex03 @@ -289,8 +266,7 @@ psxtmmutex03_SOURCES = psxtmmutex03/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmmutex03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmutex03) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmmutex04 @@ -300,8 +276,7 @@ psxtmmutex04_SOURCES = psxtmmutex04/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmmutex04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmutex04) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmmutex05 @@ -311,8 +286,7 @@ psxtmmutex05_SOURCES = psxtmmutex05/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmmutex05_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmutex05) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmmutex06 @@ -322,8 +296,7 @@ psxtmmutex06_SOURCES = psxtmmutex06/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmmutex06_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmutex06) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmmutex07 @@ -333,8 +306,7 @@ psxtmmutex07_SOURCES = psxtmmutex07/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmmutex07_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmutex07) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmmutexattr01 @@ -344,8 +316,7 @@ psxtmmutexattr01_SOURCES = psxtmmutexattr01/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmmutexattr01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmutexattr01) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmnanosleep01 @@ -356,8 +327,7 @@ psxtmnanosleep01_SOURCES = psxtmnanosleep01/init.c \ ../support/src/tmtests_support.c psxtmnanosleep01_CPPFLAGS = $(AM_CPPFLAGS) \ $(TEST_FLAGS_psxtmnanosleep01) $(support_includes) \ - -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmnanosleep02 @@ -368,8 +338,7 @@ psxtmnanosleep02_SOURCES = psxtmnanosleep02/init.c \ ../support/src/tmtests_support.c psxtmnanosleep02_CPPFLAGS = $(AM_CPPFLAGS) \ $(TEST_FLAGS_psxtmnanosleep02) $(support_includes) \ - -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmonce01 @@ -379,8 +348,7 @@ psxtmonce01_SOURCES = psxtmonce01/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmonce01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmonce01) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmrwlock01 @@ -390,8 +358,7 @@ psxtmrwlock01_SOURCES = psxtmrwlock01/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmrwlock01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmrwlock01) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmrwlock02 @@ -401,8 +368,7 @@ psxtmrwlock02_SOURCES = psxtmrwlock02/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmrwlock02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmrwlock02) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmrwlock03 @@ -412,8 +378,7 @@ psxtmrwlock03_SOURCES = psxtmrwlock03/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmrwlock03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmrwlock03) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmrwlock04 @@ -423,8 +388,7 @@ psxtmrwlock04_SOURCES = psxtmrwlock04/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmrwlock04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmrwlock04) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmrwlock05 @@ -434,8 +398,7 @@ psxtmrwlock05_SOURCES = psxtmrwlock05/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmrwlock05_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmrwlock05) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmrwlock06 @@ -445,8 +408,7 @@ psxtmrwlock06_SOURCES = psxtmrwlock06/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmrwlock06_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmrwlock06) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmrwlock07 @@ -456,8 +418,7 @@ psxtmrwlock07_SOURCES = psxtmrwlock07/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmrwlock07_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmrwlock07) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmmqrcvblock01 @@ -467,8 +428,7 @@ psxtmmqrcvblock01_SOURCES = psxtmmqrcvblock01/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmmqrcvblock01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmqrcvblock01) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmmqrcvblock02 @@ -478,8 +438,7 @@ psxtmmqrcvblock02_SOURCES = psxtmmqrcvblock02/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmmqrcvblock02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmmqrcvblock02) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmsem01 @@ -489,8 +448,7 @@ psxtmsem01_SOURCES = psxtmsem01/init.c ../tmtests/include/timesys.h \ ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmsem01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmsem01) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmsem02 @@ -500,8 +458,7 @@ psxtmsem02_SOURCES = psxtmsem02/init.c ../tmtests/include/timesys.h \ ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmsem02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmsem02) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmsem03 @@ -511,8 +468,7 @@ psxtmsem03_SOURCES = psxtmsem03/init.c ../tmtests/include/timesys.h \ ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmsem03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmsem03) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmsem04 @@ -522,8 +478,7 @@ psxtmsem04_SOURCES = psxtmsem04/init.c ../tmtests/include/timesys.h \ ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmsem04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmsem04) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmsem05 @@ -533,8 +488,7 @@ psxtmsem05_SOURCES = psxtmsem05/init.c ../tmtests/include/timesys.h \ ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmsem05_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmsem05) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmsleep01 @@ -544,8 +498,7 @@ psxtmsleep01_SOURCES = psxtmsleep01/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmsleep01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmsleep01) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmsleep02 @@ -555,8 +508,7 @@ psxtmsleep02_SOURCES = psxtmsleep02/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmsleep02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmsleep02) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmthread01 @@ -566,8 +518,7 @@ psxtmthread01_SOURCES = psxtmthread01/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmthread01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmthread01) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmthread02 @@ -577,8 +528,7 @@ psxtmthread02_SOURCES = psxtmthread02/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmthread02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmthread02) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmthread03 @@ -588,8 +538,7 @@ psxtmthread03_SOURCES = psxtmthread03/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmthread03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmthread03) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmthread04 @@ -599,8 +548,7 @@ psxtmthread04_SOURCES = psxtmthread04/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmthread04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmthread04) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmthread05 @@ -610,8 +558,7 @@ psxtmthread05_SOURCES = psxtmthread05/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmthread05_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmthread05) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmthread06 @@ -621,8 +568,7 @@ psxtmthread06_SOURCES = psxtmthread06/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmthread06_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmthread06) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif if TEST_psxtmthreadattr01 @@ -632,8 +578,7 @@ psxtmthreadattr01_SOURCES = psxtmthreadattr01/init.c \ ../tmtests/include/timesys.h ../support/src/tmtests_empty_function.c \ ../support/src/tmtests_support.c psxtmthreadattr01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtmthreadattr01) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include \ - -DOPERATION_COUNT=$(OPERATION_COUNT) + $(support_includes) -I$(top_srcdir)/../tmtests/include endif noinst_PROGRAMS = $(psxtm_tests) diff --git a/testsuites/psxtmtests/psxtmbarrier01/init.c b/testsuites/psxtmtests/psxtmbarrier01/init.c index 06d61e3c98..4c9697a8a3 100644 --- a/testsuites/psxtmtests/psxtmbarrier01/init.c +++ b/testsuites/psxtmtests/psxtmbarrier01/init.c @@ -7,6 +7,10 @@ * http://www.rtems.org/license/LICENSE. */ +#if !defined(OPERATION_COUNT) +#define OPERATION_COUNT 100 +#endif + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/testsuites/psxtmtests/psxtmbarrier02/init.c b/testsuites/psxtmtests/psxtmbarrier02/init.c index 22e9a56278..47b5a964e6 100644 --- a/testsuites/psxtmtests/psxtmbarrier02/init.c +++ b/testsuites/psxtmtests/psxtmbarrier02/init.c @@ -7,6 +7,10 @@ * http://www.rtems.org/license/LICENSE. */ +#if !defined(OPERATION_COUNT) +#define OPERATION_COUNT 100 +#endif + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -71,7 +75,7 @@ void *Middle( /* let other threads run */ (void) pthread_barrier_wait( &barrier ); - + /* should never return */ rtems_test_assert( FALSE ); return NULL; @@ -92,7 +96,7 @@ void *POSIX_Init( status = pthread_create( &threadId, NULL, Middle, NULL ); rtems_test_assert( !status ); } - + status = pthread_create( &threadId, NULL, Low, NULL ); rtems_test_assert( !status ); diff --git a/testsuites/psxtmtests/psxtmbarrier03/init.c b/testsuites/psxtmtests/psxtmbarrier03/init.c index c0334e2b53..49c3ed893d 100644 --- a/testsuites/psxtmtests/psxtmbarrier03/init.c +++ b/testsuites/psxtmtests/psxtmbarrier03/init.c @@ -7,6 +7,10 @@ * http://www.rtems.org/license/LICENSE. */ +#if !defined(OPERATION_COUNT) +#define OPERATION_COUNT 100 +#endif + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/testsuites/psxtmtests/psxtmbarrier04/init.c b/testsuites/psxtmtests/psxtmbarrier04/init.c index 5d4885c193..a463d9a8d2 100644 --- a/testsuites/psxtmtests/psxtmbarrier04/init.c +++ b/testsuites/psxtmtests/psxtmbarrier04/init.c @@ -7,9 +7,14 @@ * http://www.rtems.org/license/LICENSE. */ +#if !defined(OPERATION_COUNT) +#define OPERATION_COUNT 100 +#endif + #ifdef HAVE_CONFIG_H #include "config.h" #endif + #include #include #include "test_support.h" diff --git a/testsuites/psxtmtests/psxtmbarrierattr01/init.c b/testsuites/psxtmtests/psxtmbarrierattr01/init.c index f1fa632f70..2e7429a720 100644 --- a/testsuites/psxtmtests/psxtmbarrierattr01/init.c +++ b/testsuites/psxtmtests/psxtmbarrierattr01/init.c @@ -25,6 +25,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#if !defined(OPERATION_COUNT) +#define OPERATION_COUNT 100 +#endif + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/testsuites/psxtmtests/psxtmcleanup01/init.c b/testsuites/psxtmtests/psxtmcleanup01/init.c index 0bca307a62..3bac0d909b 100644 --- a/testsuites/psxtmtests/psxtmcleanup01/init.c +++ b/testsuites/psxtmtests/psxtmcleanup01/init.c @@ -25,6 +25,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#if !defined(OPERATION_COUNT) +#define OPERATION_COUNT 100 +#endif + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/testsuites/psxtmtests/psxtmcond08/init.c b/testsuites/psxtmtests/psxtmcond08/init.c index 4839e5591d..7faffe1246 100644 --- a/testsuites/psxtmtests/psxtmcond08/init.c +++ b/testsuites/psxtmtests/psxtmcond08/init.c @@ -7,6 +7,10 @@ * http://www.rtems.org/license/LICENSE. */ +#if !defined(OPERATION_COUNT) +#define OPERATION_COUNT 100 +#endif + #if defined(USE_WAIT) #define TEST_NUMBER "08" #define TEST_CASE "pthread_cond_wait: blocking" diff --git a/testsuites/psxtmtests/psxtmmutex02/init.c b/testsuites/psxtmtests/psxtmmutex02/init.c index 58689e618b..6cd29468a0 100644 --- a/testsuites/psxtmtests/psxtmmutex02/init.c +++ b/testsuites/psxtmtests/psxtmmutex02/init.c @@ -7,6 +7,10 @@ * http://www.rtems.org/license/LICENSE. */ +#if !defined(OPERATION_COUNT) +#define OPERATION_COUNT 100 +#endif + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -91,7 +95,7 @@ void *POSIX_Init( status = pthread_create( &threadId, NULL, Middle, NULL ); rtems_test_assert( !status ); } - + status = pthread_create( &threadId, NULL, Low, NULL ); rtems_test_assert( !status ); diff --git a/testsuites/psxtmtests/psxtmmutex06/init.c b/testsuites/psxtmtests/psxtmmutex06/init.c index fe22753faf..402c1cca82 100644 --- a/testsuites/psxtmtests/psxtmmutex06/init.c +++ b/testsuites/psxtmtests/psxtmmutex06/init.c @@ -7,6 +7,10 @@ * http://www.rtems.org/license/LICENSE. */ +#if !defined(OPERATION_COUNT) +#define OPERATION_COUNT 100 +#endif + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -130,7 +134,7 @@ void *POSIX_Init( ); rtems_test_assert( status == 0 ); } - + /* * Now start the timer which will be stopped in Low */ diff --git a/testsuites/psxtmtests/psxtmsem03/init.c b/testsuites/psxtmtests/psxtmsem03/init.c index 5696145008..69ac86d070 100644 --- a/testsuites/psxtmtests/psxtmsem03/init.c +++ b/testsuites/psxtmtests/psxtmsem03/init.c @@ -7,6 +7,10 @@ * http://www.rtems.org/license/LICENSE. */ +#if !defined(OPERATION_COUNT) +#define OPERATION_COUNT 100 +#endif + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -93,7 +97,7 @@ void *POSIX_Init( status = pthread_create( &threadId, NULL, Middle, NULL ); rtems_test_assert( status == 0 ); } - + status = pthread_create( &threadId, NULL, Low, NULL ); rtems_test_assert( status == 0 ); diff --git a/testsuites/psxtmtests/psxtmthread01/init.c b/testsuites/psxtmtests/psxtmthread01/init.c index 762ea3a6aa..c7c27559dc 100644 --- a/testsuites/psxtmtests/psxtmthread01/init.c +++ b/testsuites/psxtmtests/psxtmthread01/init.c @@ -7,6 +7,10 @@ * http://www.rtems.org/license/LICENSE. */ +#if !defined(OPERATION_COUNT) +#define OPERATION_COUNT 100 +#endif + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -58,7 +62,7 @@ void *POSIX_Init( 0 ); - + TEST_END(); rtems_test_exit(0); -- cgit v1.2.3