6 files changed, 21 insertions, 7 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b4506b4..624b55e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-01  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+	* mi6.c, mi6a.h, mi6b.h, mi6c.h, mi6d.h, mi6e.h: Correct tests.
+
 2001-09-30  Neil Booth  <neil@daikokuya.demon.co.uk>
 
 	* mi6.c, mi6a.h, mi6b.h, mi6c.h, mi6d.h, mi6e.h: New test.
diff --git a/gcc/testsuite/gcc.dg/cpp/mi6.c b/gcc/testsuite/gcc.dg/cpp/mi6.c
index 8895706..f355900 100644
--- a/gcc/testsuite/gcc.dg/cpp/mi6.c
+++ b/gcc/testsuite/gcc.dg/cpp/mi6.c
@@ -14,10 +14,11 @@
    increment VAR, since none of the initial set should have been
    flagged as optimizable.  */
 
-#define EMPTY
+#define EMPTYL
+#define EMPTYR
 #define NOT !
-#define DEFINED defined (macro)
-#define IND ! defined (macro)
+#define DEFINED defined (guard)
+#define NOT_DEFINED ! defined (guard)
 
 #include "mi6a.h"
 #include "mi6b.h"
@@ -25,6 +26,15 @@
 #include "mi6d.h"
 #include "mi6e.h"
 
+/* Define the macro guard, and redefine the macros to something that
+   forces compilation of the conditional blocks.  */
+#define guard
+#define EMPTYL 1 ||
+#define EMPTYR || 1
+#define NOT
+#define DEFINED 0
+#define NOT_DEFINED 1
+
 #define VAR five
 
 int
diff --git a/gcc/testsuite/gcc.dg/cpp/mi6a.h b/gcc/testsuite/gcc.dg/cpp/mi6a.h
index b11021c..68a2fce 100644
--- a/gcc/testsuite/gcc.dg/cpp/mi6a.h
+++ b/gcc/testsuite/gcc.dg/cpp/mi6a.h
@@ -1,4 +1,4 @@
-#if IND
+#if NOT_DEFINED
  #ifdef VAR
    VAR++;
  #endif
diff --git a/gcc/testsuite/gcc.dg/cpp/mi6b.h b/gcc/testsuite/gcc.dg/cpp/mi6b.h
index 0d89ddf..d2fe8be1 100644
--- a/gcc/testsuite/gcc.dg/cpp/mi6b.h
+++ b/gcc/testsuite/gcc.dg/cpp/mi6b.h
@@ -1,4 +1,4 @@
-#if NOT defined (macro)
+#if NOT defined (guard)
  #ifdef VAR
    VAR++;
  #endif
diff --git a/gcc/testsuite/gcc.dg/cpp/mi6d.h b/gcc/testsuite/gcc.dg/cpp/mi6d.h
index 7cb4b6b..a1eabba 100644
--- a/gcc/testsuite/gcc.dg/cpp/mi6d.h
+++ b/gcc/testsuite/gcc.dg/cpp/mi6d.h
@@ -1,4 +1,4 @@
-#if EMPTY !defined (macro)
+#if EMPTYL !defined (guard)
  #ifdef VAR
    VAR++;
  #endif
diff --git a/gcc/testsuite/gcc.dg/cpp/mi6e.h b/gcc/testsuite/gcc.dg/cpp/mi6e.h
index e60ca44..26ba715 100644
--- a/gcc/testsuite/gcc.dg/cpp/mi6e.h
+++ b/gcc/testsuite/gcc.dg/cpp/mi6e.h
@@ -1,4 +1,4 @@
-#if !defined (macro) EMPTY
+#if !defined (guard) EMPTYR
  #ifdef VAR
    VAR++;
  #endif