* mi6.c, mi6a.h, mi6b.h, mi6c.h, mi6d.h, mi6e.h: Correct tests.

From-SVN: r45921

gcc/testsuite/ChangeLog

+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.

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

gcc/testsuite/gcc.dg/cpp/mi6a.h

-#if IND
+#if NOT_DEFINED
  #ifdef VAR
    VAR++;
  #endif

gcc/testsuite/gcc.dg/cpp/mi6b.h

-#if NOT defined (macro)
+#if NOT defined (guard)
  #ifdef VAR
    VAR++;
  #endif

gcc/testsuite/gcc.dg/cpp/mi6d.h

-#if EMPTY !defined (macro)
+#if EMPTYL !defined (guard)
  #ifdef VAR
    VAR++;
  #endif

gcc/testsuite/gcc.dg/cpp/mi6e.h

-#if !defined (macro) EMPTY
+#if !defined (guard) EMPTYR
  #ifdef VAR
    VAR++;
  #endif