TEST/APPS: Skip build when generating packages (#10818)

Author: tvegas1

configure.ac

@@ -221,6 +221,7 @@ AS_IF([test "x$with_docs_only" = xyes],
      AM_CONDITIONAL([ENABLE_EXPERIMENTAL_API], [false])
      AM_CONDITIONAL([INSTALL_DEVEL_HEADERS], [false])
      AM_CONDITIONAL([HAVE_EXAMPLES], [false])
+     AM_CONDITIONAL([HAVE_TEST_APPS], [false])
      AM_CONDITIONAL([HAVE_AARCH64_THUNDERX2], [false])
      AM_CONDITIONAL([HAVE_AARCH64_THUNDERX1], [false])
      AM_CONDITIONAL([HAVE_AARCH64_HI1620], [false])
@@ -335,6 +336,16 @@ AS_IF([test "x$with_docs_only" = xyes],
                    [],
                    [enable_examples=no])
     AM_CONDITIONAL([HAVE_EXAMPLES], [test "x$enable_examples" = "xyes"])
+
+     #
+     # Enable test apps build
+     #
+     AC_ARG_ENABLE([test-apps],
+                   AS_HELP_STRING([--enable-test-apps],
+                                  [Enable test apps build, default: NO]),
+                   [],
+                   [enable_test_apps=no])
+    AM_CONDITIONAL([HAVE_TEST_APPS], [test "x$enable_test_apps" = "xyes"])
     ]) # Docs only
 
 #

contrib/configure-devel

@@ -14,6 +14,7 @@ basedir=$(cd $(dirname $0) && pwd)
 $basedir/../configure \
 	--enable-gtest \
 	--enable-examples \
+	--enable-test-apps \
 	--with-valgrind \
 	--enable-profiling \
 	--enable-frame-pointer \

test/apps/Makefile.am

@@ -10,6 +10,7 @@ SUBDIRS = profiling
 
 SUBDIRS += iodemo
 
+if HAVE_TEST_APPS
 noinst_PROGRAMS = \
 	test_ucp_dlopen \
 	test_ucp_config \
@@ -20,23 +21,23 @@ noinst_PROGRAMS = \
 	test_memtrack_limit \
 	test_hooks
 
-objdir = $(shell sed -n -e 's/^objdir=\(.*\)$$/\1/p' $(LIBTOOL))
+objdir_apps = $(shell sed -n -e 's/^objdir=\(.*\)$$/\1/p' $(LIBTOOL))
 
 test_hooks_SOURCES  = test_hooks.c
 test_hooks_CPPFLAGS = $(BASE_CPPFLAGS) \
-                      -DLIB_PATH=$(abs_top_builddir)/src/ucs/$(objdir)/libucs.so
+                      -DLIB_PATH=$(abs_top_builddir)/src/ucs/$(objdir_apps)/libucs.so
 test_hooks_CFLAGS   = $(BASE_CFLAGS)
 test_hooks_LDADD    = -ldl
 
 test_ucs_dlopen_SOURCES  = test_ucs_dlopen.c
 test_ucs_dlopen_CPPFLAGS = $(BASE_CPPFLAGS) \
-                           -DLIB_PATH=$(abs_top_builddir)/src/ucs/$(objdir)/libucs.so
+                           -DLIB_PATH=$(abs_top_builddir)/src/ucs/$(objdir_apps)/libucs.so
 test_ucs_dlopen_CFLAGS   = $(BASE_CFLAGS)
 test_ucs_dlopen_LDADD    = -ldl
 
 test_ucp_dlopen_SOURCES  = test_ucp_dlopen.c
 test_ucp_dlopen_CPPFLAGS = $(BASE_CPPFLAGS) \
-                           -DLIB_PATH=$(abs_top_builddir)/src/ucp/$(objdir)/libucp.so
+                           -DLIB_PATH=$(abs_top_builddir)/src/ucp/$(objdir_apps)/libucp.so
 test_ucp_dlopen_CFLAGS   = $(BASE_CFLAGS)
 test_ucp_dlopen_LDADD    = -ldl
 
@@ -57,8 +58,8 @@ test_link_map_LDADD    = -ldl $(top_builddir)/src/ucp/libucp.la
 
 test_dlopen_cfg_print_SOURCES  = test_dlopen_cfg_print.c
 test_dlopen_cfg_print_CPPFLAGS = $(BASE_CPPFLAGS) -g \
-	-DUCS_LIB_PATH=$(abs_top_builddir)/src/ucs/$(objdir)/libucs.so \
-	-DUCT_LIB_PATH=$(abs_top_builddir)/src/uct/$(objdir)/libuct.so
+	-DUCS_LIB_PATH=$(abs_top_builddir)/src/ucs/$(objdir_apps)/libucs.so \
+	-DUCT_LIB_PATH=$(abs_top_builddir)/src/uct/$(objdir_apps)/libuct.so
 test_dlopen_cfg_print_CFLAGS   = $(BASE_CFLAGS)
 test_dlopen_cfg_print_LDADD    = -ldl
 
@@ -124,3 +125,5 @@ test_tcmalloc_CFLAGS   = $(BASE_CFLAGS)
 test_tcmalloc_LDADD    = -ldl $(TCMALLOC_LIB) \
                           $(top_builddir)/src/ucp/libucp.la
 endif
+
+endif