Skip to content

Commit 6432076

Browse files
author
Christian Hergert
committed
tests: dont run parallel tests on solaris based host.
1 parent e030cd9 commit 6432076

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

build/autotools/SetupAutomake.m4

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ AM_CONDITIONAL([OS_LINUX],[test "$os_linux" = "yes"])
88
AM_CONDITIONAL([OS_GNU],[test "$os_gnu" = "yes"])
99
AM_CONDITIONAL([OS_DARWIN],[test "$os_darwin" = "yes"])
1010
AM_CONDITIONAL([OS_FREEBSD],[test "$os_freebsd" = "yes"])
11+
AM_CONDITIONAL([OS_SOLARIS],[test "$os_solaris" = "yes"])
1112

1213
# Compiler Conditionals.
1314
AM_CONDITIONAL([COMPILER_GCC],[test "$c_compiler" = "gcc" && test "$cxx_compiler" = "g++"])

tests/Makefile.am

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,17 @@ tests/trust_dir/done: $(top_srcdir)/tests/make_ca.pl $(top_srcdir)/tests/trust_d
113113
$< $(top_srcdir)/tests/trust_dir $(top_srcdir)/tests/trust_dir.cnf
114114
touch $(top_srcdir)/tests/trust_dir/done
115115

116+
if OS_SOLARIS
117+
TEST_ARGS = "-f -p"
118+
endif
119+
116120
if ENABLE_SSL
117121
test: $(TEST_PROGS) test_certs
118122
else
119123
test: $(TEST_PROGS)
120124
endif
121125
@ for TEST_PROG in $(TEST_PROGS) ; do \
122-
./$$TEST_PROG -F test.log; \
126+
./$$TEST_PROG $(TEST_ARGS) -F test.log; \
123127
done
124128

125129
.PHONY: test_certs

0 commit comments

Comments
 (0)