[Open-scap] [PATCH 10/11] Tests API automake restructuring

Marshall Miller mmiller at tresys.com
Wed May 11 19:31:29 UTC 2011


From: Francisco Slavin <fslavin at tresys.com>

Using AM_CONDITIONAL flags to selectively run tests in tests/API
---
 tests/API/Makefile.am |   44 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/tests/API/Makefile.am b/tests/API/Makefile.am
index 7755c2e..6a4f581 100644
--- a/tests/API/Makefile.am
+++ b/tests/API/Makefile.am
@@ -1,10 +1,38 @@
-SUBDIRS = CCE \
-          CVE \
-          CPE \
-          CVSS \
-          SEAP \
-          OVAL \
-          XCCDF \
+if WANT_PROBES
+PROBES_SUBDIR = probes
+endif
+
+if WANT_CCE
+CCE_SUBDIR = CCE
+endif
+
+if WANT_CPE
+CPE_SUBDIR = CPE
+endif
+
+if WANT_CVE
+CVE_SUBDIR = CVE
+endif
+
+if WANT_CVSS
+CVSS_SUBDIR = CVSS
+endif
+
+if WANT_OVAL
+OVAL_SUBDIR = OVAL
+endif
+
+if WANT_XCCDF
+XCCDF_SUBDIR = XCCDF
+endif
+
+SUBDIRS = SEAP \
           crypt \
-          probes
+          $(CCE_SUBDIR) \
+          $(CVE_SUBDIR) \
+          $(CPE_SUBDIR) \
+          $(CVSS_SUBDIR) \
+          $(OVAL_SUBDIR) \
+          $(XCCDF_SUBDIR) \
+          $(PROBES_SUBDIR)
 
-- 
1.6.2.5




More information about the Open-scap-list mailing list