]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
makefile: don't include the whole test/ directory
authorJason Ish <jason.ish@oisf.net>
Fri, 21 May 2021 17:06:47 +0000 (11:06 -0600)
committerVictor Julien <victor@inliniac.net>
Tue, 25 May 2021 08:47:45 +0000 (10:47 +0200)
Including the whole directory results in .deps files ending up
in the distribution archive which shouldn't be there. Instead
we have to list all the test sources individually.

src/Makefile.am

index fb0da712ae04c60a494f5497aa489063da1a2935..15029b8ee14049b7b932366fb9afce14d7684d0e 100755 (executable)
@@ -1156,7 +1156,61 @@ libsuricata_c_a_SOURCES = \
        win32-service.c \
        win32-syscall.c
 
-EXTRA_DIST = tests
+EXTRA_DIST = \
+       tests/stream-tcp-inline.c \
+       tests/stream-tcp-list.c \
+       tests/detect-ipv4hdr.c \
+       tests/detect-ipv6hdr.c \
+       tests/detect-tcphdr.c \
+       tests/detect-udphdr.c \
+       tests/reputation.c \
+       tests/detect-bsize.c \
+       tests/detect-http2.c \
+       tests/detect-icmpv6-mtu.c \
+       tests/detect-icmpv6hdr.c \
+       tests/detect-snmp-pdu_type.c \
+       tests/detect-snmp-version.c \
+       tests/detect-tcpmss.c \
+       tests/detect-template.c \
+       tests/detect-transform-pcrexform.c \
+       tests/detect-ttl.c \
+       tests/source-pcap.c \
+       tests/app-layer-htp-file.c \
+       tests/detect-engine-content-inspection.c \
+       tests/detect-icmpv4hdr.c \
+       tests/detect-parse.c \
+       tests/stream-tcp-reassemble.c \
+       tests/detect-file-data.c \
+       tests/detect-http-client-body.c \
+       tests/detect-http-cookie.c \
+       tests/detect-http-header.c \
+       tests/detect-http-host.c \
+       tests/detect-http-method.c \
+       tests/detect-http-raw-header.c \
+       tests/detect-http-server-body.c \
+       tests/detect-http-stat-code.c \
+       tests/detect-http-stat-msg.c \
+       tests/detect-http-uri.c \
+       tests/detect-http-user-agent.c \
+       tests/detect-snmp-community.c \
+       tests/detect-ssl-state.c \
+       tests/detect-ssl-version.c \
+       tests/detect-template-buffer.c \
+       tests/detect-template2.c \
+       tests/detect-tls-cert-fingerprint.c \
+       tests/detect-tls-cert-issuer.c \
+       tests/detect-tls-cert-serial.c \
+       tests/detect-tls-cert-subject.c \
+       tests/detect-tls-cert-validity.c \
+       tests/detect-tls-certs.c \
+       tests/detect-tls-ja3-hash.c \
+       tests/detect-tls-ja3-string.c \
+       tests/detect-tls-ja3s-hash.c \
+       tests/detect-tls-ja3s-string.c \
+       tests/detect-tls-sni.c \
+       tests/detect-tls-version.c \
+       tests/detect.c \
+       tests/stream-tcp.c
 
 install-headers:
        mkdir -p $(DESTDIR)${includedir}/suricata
@@ -1211,92 +1265,92 @@ if BUILD_FUZZTARGETS
 LDFLAGS_FUZZ = $(all_libraries) $(SECLDFLAGS)
 LDADD_FUZZ = libsuricata_c.a $(RUST_SURICATA_LIB) $(HTP_LDADD) $(RUST_LDADD)
 
-nodist_fuzz_applayerprotodetectgetproto_SOURCES = tests/fuzz/fuzz_applayerprotodetectgetproto.c
+fuzz_applayerprotodetectgetproto_SOURCES = tests/fuzz/fuzz_applayerprotodetectgetproto.c
 fuzz_applayerprotodetectgetproto_LDFLAGS = $(LDFLAGS_FUZZ)
 fuzz_applayerprotodetectgetproto_LDADD = $(LDADD_FUZZ)
 if HAS_FUZZLDFLAGS
     fuzz_applayerprotodetectgetproto_LDFLAGS += $(LIB_FUZZING_ENGINE)
 else
-    nodist_fuzz_applayerprotodetectgetproto_SOURCES += tests/fuzz/onefile.c
+    fuzz_applayerprotodetectgetproto_SOURCES += tests/fuzz/onefile.c
 endif
 # force usage of CXX for linker
 nodist_EXTRA_fuzz_applayerprotodetectgetproto_SOURCES = force-cxx-linking.cxx
 
-nodist_fuzz_applayerparserparse_SOURCES = tests/fuzz/fuzz_applayerparserparse.c
+fuzz_applayerparserparse_SOURCES = tests/fuzz/fuzz_applayerparserparse.c
 fuzz_applayerparserparse_LDFLAGS = $(LDFLAGS_FUZZ)
 fuzz_applayerparserparse_LDADD = $(LDADD_FUZZ)
 if HAS_FUZZLDFLAGS
     fuzz_applayerparserparse_LDFLAGS += $(LIB_FUZZING_ENGINE)
 else
-    nodist_fuzz_applayerparserparse_SOURCES += tests/fuzz/onefile.c
+    fuzz_applayerparserparse_SOURCES += tests/fuzz/onefile.c
 endif
 # force usage of CXX for linker
 nodist_EXTRA_fuzz_applayerparserparse_SOURCES = force-cxx-linking.cxx
 
-nodist_fuzz_siginit_SOURCES = tests/fuzz/fuzz_siginit.c
+fuzz_siginit_SOURCES = tests/fuzz/fuzz_siginit.c
 fuzz_siginit_LDFLAGS = $(LDFLAGS_FUZZ)
 fuzz_siginit_LDADD = $(LDADD_FUZZ)
 if HAS_FUZZLDFLAGS
     fuzz_siginit_LDFLAGS += $(LIB_FUZZING_ENGINE)
 else
-    nodist_fuzz_siginit_SOURCES += tests/fuzz/onefile.c
+    fuzz_siginit_SOURCES += tests/fuzz/onefile.c
 endif
 # force usage of CXX for linker
 nodist_EXTRA_fuzz_siginit_SOURCES = force-cxx-linking.cxx
 
-nodist_fuzz_confyamlloadstring_SOURCES = tests/fuzz/fuzz_confyamlloadstring.c
+fuzz_confyamlloadstring_SOURCES = tests/fuzz/fuzz_confyamlloadstring.c
 fuzz_confyamlloadstring_LDFLAGS = $(LDFLAGS_FUZZ)
 fuzz_confyamlloadstring_LDADD = $(LDADD_FUZZ)
 if HAS_FUZZLDFLAGS
     fuzz_confyamlloadstring_LDFLAGS += $(LIB_FUZZING_ENGINE)
 else
-    nodist_fuzz_confyamlloadstring_SOURCES += tests/fuzz/onefile.c
+    fuzz_confyamlloadstring_SOURCES += tests/fuzz/onefile.c
 endif
 # force usage of CXX for linker
 nodist_EXTRA_fuzz_confyamlloadstring_SOURCES = force-cxx-linking.cxx
 
-nodist_fuzz_decodepcapfile_SOURCES = tests/fuzz/fuzz_decodepcapfile.c
+fuzz_decodepcapfile_SOURCES = tests/fuzz/fuzz_decodepcapfile.c
 fuzz_decodepcapfile_LDFLAGS = $(LDFLAGS_FUZZ)
 fuzz_decodepcapfile_LDADD = $(LDADD_FUZZ)
 if HAS_FUZZLDFLAGS
     fuzz_decodepcapfile_LDFLAGS += $(LIB_FUZZING_ENGINE)
 else
-    nodist_fuzz_decodepcapfile_SOURCES += tests/fuzz/onefile.c
+    fuzz_decodepcapfile_SOURCES += tests/fuzz/onefile.c
 endif
 # force usage of CXX for linker
 nodist_EXTRA_fuzz_decodepcapfile_SOURCES = force-cxx-linking.cxx
 
-nodist_fuzz_sigpcap_SOURCES = tests/fuzz/fuzz_sigpcap.c
+fuzz_sigpcap_SOURCES = tests/fuzz/fuzz_sigpcap.c
 fuzz_sigpcap_LDFLAGS = $(LDFLAGS_FUZZ)
 fuzz_sigpcap_LDADD = $(LDADD_FUZZ)
 if HAS_FUZZLDFLAGS
     fuzz_sigpcap_LDFLAGS += $(LIB_FUZZING_ENGINE)
 else
-    nodist_fuzz_sigpcap_SOURCES += tests/fuzz/onefile.c
+    fuzz_sigpcap_SOURCES += tests/fuzz/onefile.c
 endif
 # force usage of CXX for linker
 nodist_EXTRA_fuzz_sigpcap_SOURCES = force-cxx-linking.cxx
 
 if HAS_FUZZPCAP
-nodist_fuzz_sigpcap_aware_SOURCES = tests/fuzz/fuzz_sigpcap_aware.c
+fuzz_sigpcap_aware_SOURCES = tests/fuzz/fuzz_sigpcap_aware.c
 fuzz_sigpcap_aware_LDFLAGS = $(LDFLAGS_FUZZ)
 fuzz_sigpcap_aware_LDADD = $(LDADD_FUZZ) -lfuzzpcap
 if HAS_FUZZLDFLAGS
     fuzz_sigpcap_aware_LDFLAGS += $(LIB_FUZZING_ENGINE)
 else
-    nodist_fuzz_sigpcap_aware_SOURCES += tests/fuzz/onefile.c
+    fuzz_sigpcap_aware_SOURCES += tests/fuzz/onefile.c
 endif
 # force usage of CXX for linker
 nodist_EXTRA_fuzz_sigpcap_aware_SOURCES = force-cxx-linking.cxx
 endif
 
-nodist_fuzz_mimedecparseline_SOURCES = tests/fuzz/fuzz_mimedecparseline.c
+fuzz_mimedecparseline_SOURCES = tests/fuzz/fuzz_mimedecparseline.c
 fuzz_mimedecparseline_LDFLAGS = $(LDFLAGS_FUZZ)
 fuzz_mimedecparseline_LDADD = $(LDADD_FUZZ)
 if HAS_FUZZLDFLAGS
     fuzz_mimedecparseline_LDFLAGS += $(LIB_FUZZING_ENGINE)
 else
-    nodist_fuzz_mimedecparseline_SOURCES += tests/fuzz/onefile.c
+    fuzz_mimedecparseline_SOURCES += tests/fuzz/onefile.c
 endif
 # force usage of CXX for linker
 nodist_EXTRA_fuzz_mimedecparseline_SOURCES = force-cxx-linking.cxx