From 16216c83297543692b8dede52c9dd8a998758e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Sun, 9 Sep 2012 13:14:38 -0400 Subject: [PATCH] Prefix the test binaries by lxc-test- MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- runapitests.sh | 2 +- src/tests/Makefile.am | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/runapitests.sh b/runapitests.sh index 6419b187d..65bee6cad 100644 --- a/runapitests.sh +++ b/runapitests.sh @@ -18,7 +18,7 @@ EOF [ -f liblxc.so.0 ] || ln -s src/lxc/liblxc.so ./liblxc.so.0 export LD_LIBRARY_PATH=. -TESTS="containertests locktests startone" +TESTS="lxc-test-containertests lxc-test-locktests lxc-test-startone" for curtest in $TESTS; do echo "running $curtest" ./src/tests/$curtest diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index c77f1fbbe..f4e4a5a21 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -1,21 +1,23 @@ if ENABLE_TESTS LDADD = ../lxc/liblxc.so -lrt -containertests_SOURCES = containertests.c -locktests_SOURCES = locktests.c -startone_SOURCES = startone.c -destroytest_SOURCES = destroytest.c -saveconfig_SOURCES = saveconfig.c -createtest_SOURCES = createtest.c -shutdowntest_SOURCES = shutdowntest.c -get_item_SOURCES = get_item.c -getkeys_SOURCES = getkeys.c +lxc_test_containertests_SOURCES = containertests.c +lxc_test_locktests_SOURCES = locktests.c +lxc_test_startone_SOURCES = startone.c +lxc_test_destroytest_SOURCES = destroytest.c +lxc_test_saveconfig_SOURCES = saveconfig.c +lxc_test_createtest_SOURCES = createtest.c +lxc_test_shutdowntest_SOURCES = shutdowntest.c +lxc_test_get_item_SOURCES = get_item.c +lxc_test_getkeys_SOURCES = getkeys.c AM_CFLAGS=-I$(top_srcdir)/src \ -DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \ -DLXCPATH=\"$(LXCPATH)\" \ -DLXCINITDIR=\"$(LXCINITDIR)\" -bin_PROGRAMS = containertests locktests startone destroytest saveconfig createtest shutdowntest get_item getkeys +bin_PROGRAMS = lxc-test-containertests lxc-test-locktests lxc-test-startone \ + lxc-test-destroytest lxc-test-saveconfig lxc-test-createtest \ + lxc-test-shutdowntest lxc-test-get_item lxc-test-getkeys endif