So this this test is timing sensitive and can easily fail on slow
build farm machines. So I have enabled it on the --enable-slow-tests
configure option and put this into ./check as the default.
Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
check | 5 +++--
tests/Makefile.am | 7 ++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/check b/check
index b3b1c61..0fc50b9 100755
--- a/check
+++ b/check
@@ -60,10 +60,11 @@ then
fi
check() {
- echo "./configure $1 --enable-debug --enable-fatal-warnings --quiet"
+ options="$1 --enable-debug --enable-slow-tests --enable-fatal-warnings
--quiet"
+ echo "./configure $options"
echo "ENV CFLAGS=\"$CFLAGS\""
echo "ENV MAKEFLAGS=\"$MAKEFLAGS\""
- ( ./configure $1 --enable-debug --enable-fatal-warnings --quiet )
+ ( ./configure $options )
make check
if [ $? -ne 0 ]
then
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5fdf3b2..c77f7bc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -89,13 +89,18 @@ bench_log_LDADD = $(LIB_RT) $(top_builddir)/lib/libqb.la
if HAVE_CHECK
EXTRA_DIST += resources.test
-TESTS = array.test map.test util.test rb.test log.test loop.test ipc.test resources.test
+TESTS = array.test map.test rb.test log.test loop.test ipc.test resources.test
resources.log: rb.log log.log ipc.log
check_PROGRAMS = array.test map.test rb.test log.test loop.test ipc.test util.test
check_SCRIPTS = resources.test
+if HAVE_SLOW_TESTS
+TESTS += util.test
+check_PROGRAMS += util.test
+endif
+
array_test_SOURCES = check_array.c $(top_builddir)/include/qb/qbarray.h
array_test_CFLAGS = @CHECK_CFLAGS@ -I$(top_srcdir)/include
array_test_LDADD = $(top_builddir)/lib/libqb.la $(LIB_RT) @CHECK_LIBS@
--
1.7.9.1
Show replies by date