metacity r4078 - branches/veracity

[tthurman svn gnome org]

Author: tthurman
Date: Mon Jan 19 21:28:00 2009
New Revision: 4078
URL: http://svn.gnome.org/viewvc/metacity?rev=4078&view=rev

Log:
New branch for testing


Added:
   branches/veracity/
      - copied from r4074, /trunk/
Modified:
   branches/veracity/Makefile.am
   branches/veracity/configure.in

Modified: branches/veracity/Makefile.am
==============================================================================
--- /trunk/Makefile.am	(original)
+++ branches/veracity/Makefile.am	Mon Jan 19 21:28:00 2009
@@ -1,5 +1,5 @@
 
-SUBDIRS=src po doc
+SUBDIRS=src po doc test
 
 EXTRA_DIST = HACKING MAINTAINERS rationales.txt \
 	intltool-extract.in intltool-merge.in intltool-update.in

Modified: branches/veracity/configure.in
==============================================================================
--- /trunk/configure.in	(original)
+++ branches/veracity/configure.in	Mon Jan 19 21:28:00 2009
@@ -158,6 +158,11 @@
                  [disable metacity's use of the shaped window extension]),,
   enable_shape=auto)
 
+AC_ARG_ENABLE(veracity,
+  AC_HELP_STRING([--enable-veracity],
+                 [enable metacity test suite]),,
+  enable_veracity=auto)
+
 ## try definining HAVE_BACKTRACE
 AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
 
@@ -240,6 +245,15 @@
   echo "Building without compositing manager"
 fi
 
+if test x$enable_veracity = xyes; then
+  METACITY_PC_MODULES="$METACITY_PC_MODULES guile-1.8"
+  echo "Building test suite"
+  use_veracity=yes
+else
+  use_veracity=no
+fi
+AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xyes)
+
 ## if no compositor, still possibly enable render
 if test x$have_xcomposite = xno; then
   XRENDER_VERSION=0.0
@@ -501,7 +515,10 @@
 src/libmetacity-private.pc
 src/tools/Makefile
 src/themes/Makefile
+$veracity_makefile
 po/Makefile.in
+test/Makefile
+test/veracity/Makefile
 ])
 
 AC_OUTPUT
@@ -540,6 +557,8 @@
 	Xsync:                    ${found_xsync}
 	Render:                   ${have_xrender}
 	Xcursor:                  ${have_xcursor}
+
+        Build test suite:         ${use_veracity}
 "
 
 METACITY_MINOR_VERSION=metacity_minor_version