Skip to content

Commit

Permalink
selftests/timers: Use shared logic to run and install tests
Browse files Browse the repository at this point in the history
Change the timers Makefile to make use of shared run and install logic
in lib.mk. Destructive tests are installed but not run by default.

Add a new variable, TEST_PROGS_EXTENDED, which is a list of extra
programs to install, but which are not run by the default run_tests
logic.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
  • Loading branch information
Michael Ellerman authored and Shuah Khan committed Mar 19, 2015
1 parent 1c0a749 commit 5744de5
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 16 deletions.
2 changes: 1 addition & 1 deletion tools/testing/selftests/lib.mk
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ run_tests: all

define INSTALL_RULE
mkdir -p $(INSTALL_PATH)
install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_FILES)
install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES)
endef

install: all
Expand Down
27 changes: 12 additions & 15 deletions tools/testing/selftests/timers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,21 @@ CC = $(CROSS_COMPILE)gcc
BUILD_FLAGS = -DKTEST
CFLAGS += -O3 -Wl,-no-as-needed -Wall $(BUILD_FLAGS)
LDFLAGS += -lrt -lpthread
bins = posix_timers nanosleep inconsistency-check nsleep-lat raw_skew \
set-timer-lat threadtest mqueue-lat valid-adjtimex \
alarmtimer-suspend change_skew skew_consistency clocksource-switch \
leap-a-day leapcrash set-tai set-2038

all: ${bins}

# these are all "safe" tests that don't modify
# system time or require escalated privledges
run_tests: all
./posix_timers
./nanosleep
./nsleep-lat
./set-timer-lat
./mqueue-lat
./inconsistency-check
./raw_skew
./threadtest -t 30 -n 8
TEST_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \
inconsistency-check raw_skew threadtest

TEST_PROGS_EXTENDED = alarmtimer-suspend valid-adjtimex change_skew \
skew_consistency clocksource-switch leap-a-day \
leapcrash set-tai set-2038

bins = $(TEST_PROGS) $(TEST_PROGS_EXTENDED)

all: ${bins}

include ../lib.mk

# these tests require escalated privledges
# and may modify the system time or trigger
Expand Down

0 comments on commit 5744de5

Please sign in to comment.