@ -631,13 +631,13 @@ endif
# Enable building all unit tests, but use check_some to run only tests
# Enable building all unit tests, but use check_some to run only tests
# known to pass ASC (ASSERT_STATUS_CHECKED)
# known to pass ASC (ASSERT_STATUS_CHECKED)
SUBSET : = $( TESTS_PASSING_ASC)
ROCKSDBTESTS_SUBSET ? = $( TESTS_PASSING_ASC)
# Alternate: only build unit tests known to pass ASC, and run them
# Alternate: only build unit tests known to pass ASC, and run them
# with make check
# with make check
#TESTS := $(filter $(TESTS_PASSING_ASC),$(TESTS))
#TESTS := $(filter $(TESTS_PASSING_ASC),$(TESTS))
#PARALLEL_TEST := $(filter $(TESTS_PASSING_ASC),$(PARALLEL_TEST))
#PARALLEL_TEST := $(filter $(TESTS_PASSING_ASC),$(PARALLEL_TEST))
e l s e
e l s e
SUBSET : = $( TESTS)
ROCKSDBTESTS_SUBSET ? = $( TESTS)
e n d i f
e n d i f
# Not necessarily well thought out or up-to-date, but matches old list
# Not necessarily well thought out or up-to-date, but matches old list
TESTS_PLATFORM_DEPENDENT := \
TESTS_PLATFORM_DEPENDENT := \
@ -667,22 +667,22 @@ TESTS_PLATFORM_DEPENDENT := \
iostats_context_test \
iostats_context_test \
db_wal_test \
db_wal_test \
# Sort SUBSET for filtering, except db_test is special (expensive) so
# Sort ROCKSDBTESTS_ SUBSET for filtering, except db_test is special (expensive)
# is placed first (out-of-order)
# so is placed first (out-of-order)
SUBSET := $( filter db_test, $( SUBSET) ) $( sort $( filter-out db_test, $( SUBSET) ) )
ROCKSDBTESTS_ SUBSET := $( filter db_test, $( ROCKSDBTESTS_ SUBSET) ) $( sort $( filter-out db_test, $( ROCKSDBTESTS_ SUBSET) ) )
i f d e f R O C K S D B T E S T S _ S T A R T
i f d e f R O C K S D B T E S T S _ S T A R T
SUBSET := $( shell echo $( SUBSET) | sed 's/^.*$(ROCKSDBTESTS_START)/$(ROCKSDBTESTS_START)/' )
ROCKSDBTESTS_ SUBSET := $( shell echo $( ROCKSDBTESTS_ SUBSET) | sed 's/^.*$(ROCKSDBTESTS_START)/$(ROCKSDBTESTS_START)/' )
e n d i f
e n d i f
i f d e f R O C K S D B T E S T S _ E N D
i f d e f R O C K S D B T E S T S _ E N D
SUBSET := $( shell echo $( SUBSET) | sed 's/$(ROCKSDBTESTS_END).*//' )
ROCKSDBTESTS_ SUBSET := $( shell echo $( ROCKSDBTESTS_ SUBSET) | sed 's/$(ROCKSDBTESTS_END).*//' )
e n d i f
e n d i f
i f e q ( $( ROCKSDBTESTS_PLATFORM_DEPENDENT ) , o n l y )
i f e q ( $( ROCKSDBTESTS_PLATFORM_DEPENDENT ) , o n l y )
SUBSET := $( filter $( TESTS_PLATFORM_DEPENDENT) , $( SUBSET) )
ROCKSDBTESTS_ SUBSET := $( filter $( TESTS_PLATFORM_DEPENDENT) , $( ROCKSDBTESTS_ SUBSET) )
e l s e i f e q ( $( ROCKSDBTESTS_PLATFORM_DEPENDENT ) , e x c l u d e )
e l s e i f e q ( $( ROCKSDBTESTS_PLATFORM_DEPENDENT ) , e x c l u d e )
SUBSET := $( filter-out $( TESTS_PLATFORM_DEPENDENT) , $( SUBSET) )
ROCKSDBTESTS_ SUBSET := $( filter-out $( TESTS_PLATFORM_DEPENDENT) , $( ROCKSDBTESTS_ SUBSET) )
e n d i f
e n d i f
# bench_tool_analyer main is in bench_tool_analyzer_tool, or this would be simpler...
# bench_tool_analyer main is in bench_tool_analyzer_tool, or this would be simpler...
@ -784,7 +784,7 @@ endif # PLATFORM_SHARED_EXT
all : $( LIBRARY ) $( BENCHMARKS ) tools tools_lib test_libs $( TESTS )
all : $( LIBRARY ) $( BENCHMARKS ) tools tools_lib test_libs $( TESTS )
all_but_some_tests : $( LIBRARY ) $( BENCHMARKS ) tools tools_lib test_libs $( SUBSET )
all_but_some_tests : $( LIBRARY ) $( BENCHMARKS ) tools tools_lib test_libs $( ROCKSDBTESTS_ SUBSET)
static_lib : $( STATIC_LIBRARY )
static_lib : $( STATIC_LIBRARY )
@ -1002,8 +1002,8 @@ ifndef SKIP_FORMAT_BUCK_CHECKS
e n d i f
e n d i f
# TODO add ldb_tests
# TODO add ldb_tests
check_some : $( SUBSET )
check_some : $( ROCKSDBTESTS_ SUBSET)
for t in $( SUBSET) ; do echo " ===== Running $$ t (`date`) " ; ./$$ t || exit 1; done
for t in $( ROCKSDBTESTS_ SUBSET) ; do echo " ===== Running $$ t (`date`) " ; ./$$ t || exit 1; done
.PHONY : ldb_tests
.PHONY : ldb_tests
ldb_tests : ldb
ldb_tests : ldb
@ -1107,6 +1107,9 @@ ubsan_crash_test_with_best_efforts_recovery: clean
valgrind_test :
valgrind_test :
ROCKSDB_VALGRIND_RUN = 1 DISABLE_JEMALLOC = 1 $( MAKE) valgrind_check
ROCKSDB_VALGRIND_RUN = 1 DISABLE_JEMALLOC = 1 $( MAKE) valgrind_check
valgrind_test_some :
ROCKSDB_VALGRIND_RUN = 1 DISABLE_JEMALLOC = 1 $( MAKE) valgrind_check_some
valgrind_check : $( TESTS )
valgrind_check : $( TESTS )
$( MAKE) DRIVER = " $( VALGRIND_VER) $( VALGRIND_OPTS) " gen_parallel_tests
$( MAKE) DRIVER = " $( VALGRIND_VER) $( VALGRIND_OPTS) " gen_parallel_tests
$( AM_V_GEN) if test " $( J) " != 1 \
$( AM_V_GEN) if test " $( J) " != 1 \
@ -1125,6 +1128,14 @@ valgrind_check: $(TESTS)
done ; \
done ; \
fi
fi
valgrind_check_some : $( ROCKSDBTESTS_SUBSET )
for t in $( ROCKSDBTESTS_SUBSET) ; do \
$( VALGRIND_VER) $( VALGRIND_OPTS) ./$$ t; \
ret_code = $$ ?; \
if [ $$ ret_code -ne 0 ] ; then \
exit $$ ret_code; \
fi ; \
done
i f n e q ( $( PAR_TEST ) , )
i f n e q ( $( PAR_TEST ) , )
parloop :
parloop :