Changes to allow bypassing tests for certain machines

From-SVN: r21614

contrib/fixinc/Makefile

@@ -34,7 +34,7 @@ regex.o: regex.c
 	-$(CC) -g -DSTDC_HEADERS=1 -c regex.c
 
 fixincl.o : fixincl.x fixincl.c
-	-$(CC) $(CFLAGS) -o $@ -c fixincl.c
+	-$(CC) $(CFLAGS) '-DTARGET_MACHINE="$(TARGET)"' -o $@ -c fixincl.c
 
 server.o : server.c server.h
 	-$(CC) $(CFLAGS) -o $@ -c server.c
@@ -71,7 +71,7 @@ install: $(TARGETS)
 		echo cp fixincl.sh $(DESTDIR)/fixinc.sh ; \
 		cp fixincl.sh $(DESTDIR)/fixinc.sh ; \
 		chmod 555 $(DESTDIR)/fixinc.sh ; \
-    	rm -f $(DESTDIR)/fixincl ; \
+	rm -f $(DESTDIR)/fixincl ; \
 		echo cp fixincl $(DESTDIR) ; \
 		cp fixincl $(DESTDIR) ; \
 		chmod 555 $(DESTDIR)/fixincl ; \

contrib/fixinc/fixincl.tpl

@@ -33,6 +33,20 @@ tSCC z[=hackname _cap=]List[] =[=
 
   _ELSE =]
 #define z[=hackname _cap=]List (char*)NULL[=
+  _ENDIF "files _exist" =]
+/*
+ *  Machine/OS name selection pattern
+ */[=
+
+  _IF mach _exist=]
+tSCC* apz[=hackname _cap=]Machs[] = {[=
+    _FOR mach =]
+        [=mach _str=],[=
+    /mach=]
+        (const char*)NULL };[=
+
+  _ELSE =]
+#define apz[=hackname _cap=]Machs (const char**)NULL[=
   _ENDIF "files _exist" =][=
 
   _IF exesel _exist=]
@@ -143,9 +157,13 @@ tFixDesc fixDescList[ [=_eval fix _count =] ] = {[=
 
 
 _FOR fix ",\n" =]
-  {  z[=hackname _cap=]Name,    z[=hackname _cap=]List, (regex_t*)NULL,
-     [=hackname  _up=]_TEST_CT, a[=hackname _cap=]Tests,
-     apz[=hackname _cap=]Patch }[=
+  {  z[=hackname _cap=]Name,    z[=hackname _cap=]List,
+     apz[=hackname _cap=]Machs, (regex_t*)NULL,
+     [=hackname  _up=]_TEST_CT, [=
+       _IF not_machine _exist =]FD_MACH_IFNOT[=
+       _ELSE                  =]FD_MACH_ONLY[=
+       _ENDIF =],
+     a[=hackname _cap=]Tests,   apz[=hackname _cap=]Patch }[=
 
 /fix=]
 };

contrib/fixinc/mkfixinc.sh

@@ -113,7 +113,7 @@ then
     exit 0
 fi
 
-echo $MAKE install DESTDIR=`dirname $dest`
-$MAKE install DESTDIR=`dirname $dest`
+echo $MAKE install DESTDIR=`dirname $dest` TARGET=$machine
+$MAKE install DESTDIR=`dirname $dest` TARGET=$machine
 
 exit 1