[Generic] Add --disable-tests

Maarten Lankhorst m.b.lankhorst at gmail.com
Mon Jan 8 17:26:40 CST 2007


This patch adds --disable-tests, but keeps --enable-tests by default,
this is very useful for regression testing with a specific app because
it saves a lot of building time.
-------------- next part --------------
From af45aba86e124add18f013572a58856f32362593 Mon Sep 17 00:00:00 2001
From: maarten <maarten at maarten-laptop.(none)>
Date: Mon, 8 Jan 2007 23:13:51 +0100
Subject: [PATCH] Add --disable-tests
---
 configure.ac         |   11 +++++++++++
 dlls/Makefile.in     |    2 +-
 programs/Makefile.in |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 299fa23..e9276ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,7 @@ AC_ARG_ENABLE(win64, AC_HELP_STRING([--e
 
 AC_ARG_WITH(opengl,    AC_HELP_STRING([--without-opengl],[do not use OpenGL]))
 AC_ARG_WITH(wine-tools,AC_HELP_STRING([--with-wine-tools=<dir>],[use Wine tools from directory <dir>]))
+AC_ARG_ENABLE(tests, AC_HELP_STRING([--disable-tests],[do not build the testsuites]))
 
 AC_CANONICAL_HOST
 case $host in
@@ -49,6 +50,16 @@ then
   WIN16_INSTALL=""
 fi
 
+dnl enable_tests is yes by default, but in some cases it's better to disable the testsuite
+if test "x$enable_tests" == "xno"
+then
+  AC_SUBST(TESTSUBDIRS,"")
+  AC_SUBST(WINETEST,"")
+else
+  AC_SUBST(TESTSUBDIRS,"\$(TESTSUBDIRS)")
+  AC_SUBST(WINETEST,"winetest")
+fi
+
 dnl check for out of tree build with unclean source tree
 case "$srcdir" in
  .) ;;
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 1f63226..1f30db2 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -282,7 +282,7 @@ SUBDIRS = \
 	winequartz.drv \
 	winex11.drv
 
-BUILDSUBDIRS   = $(BASEDIRS) $(EXTRADIRS) $(TESTSUBDIRS)
+BUILDSUBDIRS   = $(BASEDIRS) $(EXTRADIRS) @TESTSUBDIRS@
 INSTALLSUBDIRS = $(BASEDIRS) $(EXTRADIRS) $(IMPLIBSUBDIRS)
 DOCSUBDIRS     = $(BASEDIRS) $(EXTRADIRS)
 
diff --git a/programs/Makefile.in b/programs/Makefile.in
index 8b61cde..0878955 100644
--- a/programs/Makefile.in
+++ b/programs/Makefile.in
@@ -37,7 +37,7 @@ SUBDIRS = \
 	winemenubuilder \
 	winemine \
 	winepath \
-	winetest \
+	@WINETEST@ \
 	winevdm \
 	winhelp \
 	winver \
-- 
1.4.1


More information about the wine-patches mailing list