diff options
Diffstat (limited to 'tools/xm-test/configure.ac')
-rw-r--r-- | tools/xm-test/configure.ac | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/tools/xm-test/configure.ac b/tools/xm-test/configure.ac index 5183162f82..87df5cd6bd 100644 --- a/tools/xm-test/configure.ac +++ b/tools/xm-test/configure.ac @@ -1,19 +1,20 @@ # xm-test configure.ac input script # Basic header information -AC_INIT([xm-test], [0.8.0]) +AC_INIT([xm-test], [1.1.0]) AM_INIT_AUTOMAKE([1.7 foreign]) +MK=''; AC_SUBST(MK) + # Check for dependencies AC_PROG_CC #AC_PROG_INSTALL AC_CHECK_PROG([LILO], lilo, lilo, "no", [$PATH]) -# Right now, we can assume that the lib/ and ramdisk/ directories -# are two levels above the tests +# Right now, we can assume that the lib/ directory +# is two levels above the tests TESTLIB=../../lib -RD_PATH=../../ramdisk -TENV="PYTHONPATH=$PYTHONPATH:$TESTLIB RD_PATH=$RD_PATH" +TENV="PYTHONPATH=$PYTHONPATH:$TESTLIB" AC_ARG_ENABLE(hvm-support, [[ --enable-hvm-support enable hardware virtual machine assist]], @@ -38,6 +39,20 @@ fi AM_CONDITIONAL(HVM, test x$ENABLE_HVM = xTrue) AC_SUBST(ENABLE_HVM) +AC_ARG_ENABLE(full-labeling, + [[ --enable-full-labeling allows the test suite to label all resources]], + [ + ENABLE_LABELING=True + ],[ + ENABLE_LABELING=False + ]) + +if test "x$ENABLE_LABELING" = "xTrue"; then + echo "ACM_LABEL_RESOURCES = True" > lib/XmTestLib/acm_config.py +else + rm -f lib/XmTestLib/acm_config.py* +fi + # Network needs to know ips to use: dhcp or a range of IPs in the form # of: 192.168.1.1-192.168.1.100 # If not dhcp, a netmask and network address must be supplied. Defaults to @@ -127,6 +142,7 @@ AC_CONFIG_FILES([ tests/restore/Makefile tests/save/Makefile tests/sched-credit/Makefile + tests/security-acm/Makefile tests/sedf/Makefile tests/shutdown/Makefile tests/sysrq/Makefile |