From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 9 Nov 2010 22:21:42 +0000 (+1300)
Subject: Omit compat/os/ from direct header testing.
X-Git-Tag: SQUID_3_1_10~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3acd07ac025f0ff1cd4c2145fffed9b85237256b;p=thirdparty%2Fsquid.git

Omit compat/os/ from direct header testing.

The structural requirements of compat/ guarantee that they will be tested
wherever needed by indirect inclusion.

This also permits removal of one special-case usage of testHeaders.
---

diff --git a/compat/Makefile.am b/compat/Makefile.am
index 2e3d3d9c97..9d14a32cbe 100644
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -3,7 +3,7 @@
 #
 
 include $(top_srcdir)/src/Common.am
-
+include $(top_srcdir)/src/TestHeaders.am
 
 # Ideally this would be 100% inline functions and macro wrappers.
 
@@ -51,17 +51,3 @@ testPreCompiler_SOURCES= \
 	$(top_srcdir)/src/tests/testMain.cc
 testPreCompiler_LDADD= $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS)
 testPreCompiler_LDFLAGS=
-
-# os/ subdir prevents us using src/TestHeaders.am
-#
-TESTS += testHeaders
-
-## Special Universal .h dependency test script
-## aborts if error encountered
-testHeaders: $(srcdir)/*.h $(srcdir)/os/*.h
-	$(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(srcdir)" || exit 1
-	$(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(srcdir)/os" || exit 1
-
-CLEANFILES += testHeaders
-
-.PHONY: testHeaders