build: Add test wrappers to the main ignore file

They are generated at configure time, so it's a good idea to have them
in the main ignore file instead of adding them to the built ignore files
under tests.

diff --git a/.gitignore b/.gitignore
index bc37555..b00d14a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -93,6 +93,8 @@ mkinstalldirs
 stamp-h1
 TAGS
 /tests/tools/disable-npots.sh
+/tests/conform/test-launcher.sh
+/tests/interactive/wrapper.sh
 /po/POTFILES
 /po/*.gmo
 /po/Makefile.in.in

diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index 5428f8a..96cdaf6 100644 (file)
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -99,7 +99,6 @@ stamp-test-conformance: Makefile $(srcdir)/test-conform-main.c
        @chmod +x test-launcher.sh
        @( echo "/stamp-test-conformance" ; \
           echo "/test-conformance" ; \
-          echo "/test-launcher.sh" ; \
           echo "*.o" ; \
           echo "*.xml" ; \
           echo "*.html" ; \

diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 02cbb83..b384957 100644 (file)
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -72,7 +72,6 @@ stamp-test-interactive: Makefile test-interactive$(EXEEXT)
        chmod +x $$wrapper && \
        ( echo "/stamp-test-interactive" ; \
          echo "/test-interactive" ; \
-         echo "/wrapper.sh" ; \
          echo "*.o" ; \
          echo ".gitignore" ) > .gitignore ; \
        for i in $(UNIT_TESTS); \