Index: batch_run
===================================================================
RCS file: /cvs/mauve/mauve/batch_run,v
retrieving revision 1.6
diff -u -r1.6 batch_run
--- batch_run	4 Jan 2005 20:53:30 -0000	1.6
+++ batch_run	5 Jan 2005 00:09:39 -0000
@@ -44,8 +44,10 @@
 
 COMPILER_FLAGS="-g"
 
+if test "x$NATIVE" = "x"; then
 NATIVE=
 #NATIVE="true"
+fi
 
 # Cleanup
 find gnu/testlet -name "*.class" | xargs rm -f
@@ -69,6 +71,10 @@
         XVFB=`which Xvfb`
         if test "x$WM" = "x"; then
             WM=`which metacity`
+	    # check if we found metacity
+            if test "x$WM" = "x"; then
+                WM=`which true`
+            fi
         fi
 
         if test -z "$SHOW_GUI_TESTS"; then
Index: choose
===================================================================
RCS file: /cvs/mauve/mauve/choose,v
retrieving revision 1.27
diff -u -r1.27 choose
--- choose	4 Jan 2005 20:53:30 -0000	1.27
+++ choose	5 Jan 2005 00:09:39 -0000
@@ -121,7 +121,7 @@
 done
 
 # By default, use JDK1.1.
-test -z "$tags" && tags="JDK1.0 JDK1.1"
+test -z "$tags" && tags="JDK1.0 JDK1.1 GUI"
 
 test -n "$verbose" && echo "tags = $tags"
 test -n "$verbose" && echo "spectags = $spectags"
Index: choose-classes
===================================================================
RCS file: /cvs/mauve/mauve/choose-classes,v
retrieving revision 1.4
diff -u -r1.4 choose-classes
--- choose-classes	26 Dec 2004 17:02:16 -0000	1.4
+++ choose-classes	5 Jan 2005 00:09:39 -0000
@@ -70,6 +70,10 @@
        file="`echo $i | tr . /`"
        file_specs="$file_specs $file"
        ;;
+    GUI)
+       tags="$tags GUI $i"
+       test -z "$seen_dashdash" && spectags="$spectags $i"
+       ;;
     JAVA2)
        tags="$tags JDK1.0 JDK1.1 JDK1.2 $i"
        test -z "$seen_dashdash" && spectags="$spectags $i"
@@ -118,7 +122,7 @@
 done
 
 # By default, use JDK1.1.
-test -z "$tags" && tags="JDK1.0 JDK1.1"
+test -z "$tags" && tags="JDK1.0 JDK1.1 GUI"
 
 test -n "$verbose" && echo "tags = $tags"
 test -n "$verbose" && echo "spectags = $spectags"