-SUBDIRS = utils unit compile benchmark
+# SPDX-License-Identifier: LGPL-2.1-only
-LOG_DRIVER_FLAGS='--merge'
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
- $(srcdir)/utils/tap-driver.sh
+SUBDIRS = utils unit compile benchmark regression
+
+LOG_DRIVER_FLAGS = --merge --comments
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' \
+ UST_TESTS_SRCDIR='$(abs_top_srcdir)/tests' \
+ UST_TESTS_BUILDDIR='$(abs_top_builddir)/tests' \
+ $(SHELL) $(srcdir)/utils/tap-driver.sh
+
+# Unit tests
TESTS = \
unit/libringbuffer/test_shm \
unit/libmsgpack/test_msgpack \
unit/pthread_name/test_pthread_name \
unit/snprintf/test_snprintf \
- unit/ust-elf/test_ust_elf
+ unit/ust-elf/test_ust_elf \
+ unit/ust-error/test_ust_error \
+ unit/ust-utils/test_ust_utils
+
+if HAVE_CXX
+TESTS += \
+ unit/ust-utils/test_ust_utils_cxx
+endif
+
+# Regression tests
+
+TESTS += \
+ regression/abi0-conflict/test_abi0_conflict
EXTRA_DIST = README