shebs 02/09/08 11:49:45
Modified: gcc toplev.c
gcc/testsuite/lib g++.exp gcc.exp
Log:
Conditionalize the new testsuite bits to work on non-Darwin.
Revision Changes Path
1.154 +2 -6 gcc3/gcc/toplev.c
Index: toplev.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/toplev.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- toplev.c 2002/09/07 00:39:43 1.153
+++ toplev.c 2002/09/08 18:49:44 1.154
@@ -5912,15 +5912,11 @@
do_compile ();
/* APPLE LOCAL begin testsuite OS flush bug workaround */
+#ifdef CONFIG_DARWIN_H
if (flag_slow_exit)
sleep (1);
- /* APPLE LOCAL end testsuite OS flush bug workaround */
-
- /* APPLE LOCAL work around Radar 2844245. */
- fflush(stdout); fflush(stderr);
-#if 0 /* this helps test results sometimes */
- sleep (2);
#endif
+ /* APPLE LOCAL end testsuite OS flush bug workaround */
if (errorcount || sorrycount)
return (FATAL_EXIT_CODE);
1.7 +5 -2 gcc3/gcc/testsuite/lib/g++.exp
Index: g++.exp
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/testsuite/lib/g++.exp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- g++.exp 2002/09/07 00:39:44 1.6
+++ g++.exp 2002/09/08 18:49:45 1.7
@@ -291,8 +291,11 @@
}
lappend options "additional_flags=[libio_include_flags]"
- # APPLE LOCAL testsuite multiply defined
- lappend options "ldflags=-Wl,-multiply_defined,suppress"
+ # APPLE LOCAL begin testsuite multiply defined
+ if [ istarget *-*-darwin* ] {
+ lappend options "ldflags=-Wl,-multiply_defined,suppress"
+ }
+ # APPLE LOCAL end testsuite multiply defined
lappend options "compiler=$GXX_UNDER_TEST";
set options [concat $gpp_compile_options $options]
1.16 +5 -2 gcc3/gcc/testsuite/lib/gcc.exp
Index: gcc.exp
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/testsuite/lib/gcc.exp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gcc.exp 2002/09/07 00:39:44 1.15
+++ gcc.exp 2002/09/08 18:49:45 1.16
@@ -154,8 +154,11 @@
if [target_info exists gcc,timeout] {
lappend options "timeout=[target_info gcc,timeout]"
}
- # APPLE LOCAL testsuite multiply defined
- lappend options "ldflags=-Wl,-multiply_defined,suppress"
+ # APPLE LOCAL begin testsuite multiply defined
+ if [ istarget *-*-darwin* ] {
+ lappend options "ldflags=-Wl,-multiply_defined,suppress"
+ }
+ # APPLE LOCAL end testsuite multiply defined
lappend options "compiler=$GCC_UNDER_TEST"
return [target_compile $source $dest $type $options]
}
