From 8461e3f3e770c0a83aa6bbb225c4e846aa1a03fd Mon Sep 17 00:00:00 2001 From: Philippe Antoine Date: Sun, 4 Oct 2026 22:10:52 +0200 Subject: [PATCH] src: do not include "util-unittest.h" directly It is included in suricata-common.h Ticket: 945 --- src/app-layer-detect-proto.c | 1 - src/app-layer-dnp3.c | 1 - src/app-layer-htp-xff.c | 1 - src/app-layer-htp.c | 1 - src/app-layer-http2.c | 1 - src/app-layer-ike.c | 1 - src/app-layer-modbus.c | 1 - src/app-layer-nfs-tcp.c | 1 - src/app-layer-nfs-udp.c | 1 - src/app-layer-smb.c | 1 - src/app-layer-smtp.c | 1 - src/app-layer-ssh.c | 1 - src/app-layer.c | 1 - src/conf-yaml-loader.c | 1 - src/conf.c | 1 - src/decode-chdlc.c | 1 - src/decode-erspan.c | 1 - src/decode-esp.c | 1 - src/decode-etag.c | 1 - src/decode-ethernet.c | 1 - src/decode-geneve.c | 1 - src/decode-gre.c | 1 - src/decode-icmpv4.c | 1 - src/decode-mpls.c | 1 - src/decode-nsh.c | 1 - src/decode-null.c | 1 - src/decode-ppp.c | 1 - src/decode-pppoe.c | 1 - src/decode-raw.c | 1 - src/decode-sctp.c | 1 - src/decode-tcp.c | 1 - src/decode-udp.c | 1 - src/decode-vlan.c | 1 - src/decode-vntag.c | 1 - src/decode-vxlan.c | 1 - src/defrag.c | 1 - src/detect-app-layer-event.c | 1 - src/detect-app-layer-protocol.c | 1 - src/detect-app-layer-state.c | 1 - src/detect-asn1.c | 1 - src/detect-base64-data.c | 1 - src/detect-base64-decode.c | 1 - src/detect-bsize.c | 1 - src/detect-bypass.c | 1 - src/detect-byte-extract.c | 1 - src/detect-bytejump.c | 1 - src/detect-bytemath.c | 1 - src/detect-bytetest.c | 1 - src/detect-classtype.c | 1 - src/detect-config.c | 1 - src/detect-content.c | 1 - src/detect-csum.c | 1 - src/detect-detection-filter.c | 1 - src/detect-distance.c | 1 - src/detect-dnp3.c | 1 - src/detect-dsize.c | 1 - src/detect-engine-address-ipv4.c | 1 - src/detect-engine-address-ipv6.c | 1 - src/detect-engine-address.c | 1 - src/detect-engine-content-inspection.c | 1 - src/detect-engine-event.c | 1 - src/detect-engine-file.c | 1 - src/detect-engine-iponly.c | 1 - src/detect-engine-payload.c | 1 - src/detect-engine-port.c | 1 - src/detect-engine-proto.c | 1 - src/detect-engine-register.c | 1 - src/detect-engine-siggroup.c | 1 - src/detect-engine-sigorder.c | 1 - src/detect-engine-state.c | 1 - src/detect-engine-tag.c | 1 - src/detect-engine.c | 1 - src/detect-fast-pattern.c | 1 - src/detect-file-data.c | 1 - src/detect-filemagic.c | 1 - src/detect-filemd5.c | 1 - src/detect-filename.c | 1 - src/detect-filesha1.c | 1 - src/detect-filesha256.c | 1 - src/detect-filesize.c | 1 - src/detect-filestore.c | 1 - src/detect-flow.c | 1 - src/detect-flowbits.c | 1 - src/detect-flowint.c | 1 - src/detect-fragbits.c | 1 - src/detect-fragoffset.c | 1 - src/detect-frame.c | 1 - src/detect-ftpbounce.c | 1 - src/detect-ftpdata.c | 1 - src/detect-geoip.c | 1 - src/detect-gid.c | 1 - src/detect-hostbits.c | 1 - src/detect-http-client-body.c | 1 - src/detect-http-cookie.c | 1 - src/detect-http-header-common.c | 1 - src/detect-http-header-names.c | 1 - src/detect-http-host.c | 1 - src/detect-http-method.c | 1 - src/detect-http-protocol.c | 1 - src/detect-http-request-line.c | 1 - src/detect-http-response-line.c | 1 - src/detect-http-server-body.c | 1 - src/detect-http-start.c | 1 - src/detect-http-stat-code.c | 1 - src/detect-http-stat-msg.c | 1 - src/detect-http-ua.c | 1 - src/detect-http-uri.c | 1 - src/detect-icmp-id.c | 1 - src/detect-icmp-seq.c | 1 - src/detect-icode.c | 1 - src/detect-id.c | 1 - src/detect-igmp-type.c | 1 - src/detect-ipopts.c | 1 - src/detect-ipproto.c | 1 - src/detect-iprep.c | 1 - src/detect-isdataat.c | 1 - src/detect-itype.c | 1 - src/detect-l3proto.c | 1 - src/detect-lua.c | 1 - src/detect-mark.c | 1 - src/detect-metadata.c | 1 - src/detect-msg.c | 1 - src/detect-parse.c | 1 - src/detect-pcre.c | 1 - src/detect-pkt-data.c | 1 - src/detect-priority.c | 1 - src/detect-reference.c | 1 - src/detect-replace.c | 1 - src/detect-rev.c | 1 - src/detect-rpc.c | 1 - src/detect-sameip.c | 1 - src/detect-sid.c | 1 - src/detect-sip-method.c | 1 - src/detect-sip-uri.c | 1 - src/detect-ssl-state.c | 1 - src/detect-ssl-version.c | 1 - src/detect-stream_size.c | 1 - src/detect-tag.c | 1 - src/detect-target.c | 1 - src/detect-tcp-ack.c | 1 - src/detect-tcp-flags.c | 1 - src/detect-tcp-seq.c | 1 - src/detect-tcp-session.c | 2 -- src/detect-tcp-window.c | 1 - src/detect-threshold.c | 1 - src/detect-tls-cert-fingerprint.c | 1 - src/detect-tls-cert-issuer.c | 1 - src/detect-tls-cert-serial.c | 1 - src/detect-tls-cert-subject.c | 1 - src/detect-tls-cert-validity.c | 1 - src/detect-tls-certs.c | 1 - src/detect-tls-ja3-hash.c | 1 - src/detect-tls-ja3-string.c | 1 - src/detect-tls-ja3s-hash.c | 1 - src/detect-tls-ja3s-string.c | 1 - src/detect-tls-sni.c | 1 - src/detect-tls-version.c | 1 - src/detect-tls.c | 1 - src/detect-tos.c | 1 - src/detect-uricontent.c | 1 - src/detect-urilen.c | 1 - src/detect-within.c | 1 - src/detect-xbits.c | 1 - src/device-storage.c | 1 - src/flow-bit.c | 1 - src/flow-storage.c | 1 - src/flow-timeout.c | 1 - src/flow.c | 1 - src/host-bit.c | 1 - src/host-storage.c | 1 - src/ippair-bit.c | 1 - src/ippair-storage.c | 1 - src/log-stats.c | 1 - src/output-eve-stream.c | 1 - src/output-json-dhcp.c | 1 - src/output-json-dnp3.c | 1 - src/output-json-drop.c | 1 - src/output-json-email-common.c | 1 - src/output-json-file.c | 1 - src/output-json-flow.c | 1 - src/output-json-frame.c | 1 - src/output-json-ftp.c | 1 - src/output-json-http.c | 1 - src/output-json-ike.c | 1 - src/output-json-metadata.c | 1 - src/output-json-mqtt.c | 1 - src/output-json-netflow.c | 1 - src/output-json-nfs.c | 1 - src/output-json-pgsql.c | 1 - src/output-json-smtp.c | 1 - src/output-json-stats.c | 1 - src/output-json.c | 1 - src/reputation.c | 1 - src/runmode-unittests.c | 1 - src/runmodes.c | 1 - src/source-windivert.c | 1 - src/stream-tcp-inline.c | 1 - src/stream-tcp-reassemble.c | 1 - src/stream-tcp-sack.c | 1 - src/stream-tcp-util.c | 1 - src/stream-tcp.c | 1 - src/suricata-common.h | 2 ++ src/thread-storage.c | 1 - src/threads.c | 1 - src/tmqh-flow.c | 1 - src/util-action.c | 1 - src/util-affinity.c | 1 - src/util-atomic.c | 1 - src/util-byte.c | 1 - src/util-cidr.c | 1 - src/util-classification-config.c | 1 - src/util-file.c | 1 - src/util-flow-rate.c | 1 - src/util-hash.c | 1 - src/util-hashlist.c | 1 - src/util-host-os-info.c | 1 - src/util-lua-tls.c | 1 - src/util-lua.c | 1 - src/util-macset.c | 1 - src/util-magic.c | 1 - src/util-memcmp.c | 1 - src/util-misc.c | 1 - src/util-mpm-ac-ks.c | 1 - src/util-mpm-ac.c | 1 - src/util-mpm-hs.c | 1 - src/util-mpm.c | 1 - src/util-pool-thread.c | 1 - src/util-pool.c | 1 - src/util-profiling.c | 1 - src/util-proto-name.c | 1 - src/util-radix4-tree.c | 1 - src/util-radix6-tree.c | 1 - src/util-reference-config.c | 1 - src/util-rohash.c | 1 - src/util-rule-vars.c | 1 - src/util-running-modes.c | 1 - src/util-spm.c | 1 - src/util-storage.c | 1 - src/util-streaming-buffer.c | 1 - src/util-threshold-config.c | 1 - src/util-time.c | 1 - src/util-unittest-helper.c | 1 - src/util-unittest.c | 1 - src/win32-syscall.c | 1 - 244 files changed, 2 insertions(+), 244 deletions(-) diff --git a/src/app-layer-detect-proto.c b/src/app-layer-detect-proto.c index ef2c61b1b5..054cfc3b24 100644 --- a/src/app-layer-detect-proto.c +++ b/src/app-layer-detect-proto.c @@ -2184,7 +2184,6 @@ void AppLayerRegisterExpectationProto(uint8_t proto, AppProto alproto) #include "detect-engine-build.h" #include "detect-parse.h" #include "detect-engine.h" -#include "util-unittest.h" #include "util-unittest-helper.h" static AppLayerProtoDetectCtx alpd_ctx_ut; diff --git a/src/app-layer-dnp3.c b/src/app-layer-dnp3.c index b3a96127d5..9db71e9916 100644 --- a/src/app-layer-dnp3.c +++ b/src/app-layer-dnp3.c @@ -1695,7 +1695,6 @@ void RegisterDNP3Parsers(void) #include "flow-util.h" #include "stream-tcp.h" -#include "util-unittest.h" #include "threads.h" /** diff --git a/src/app-layer-htp-xff.c b/src/app-layer-htp-xff.c index d4801a3a2d..1a82478489 100644 --- a/src/app-layer-htp-xff.c +++ b/src/app-layer-htp-xff.c @@ -30,7 +30,6 @@ #include "app-layer-htp-xff.h" #include "util-misc.h" -#include "util-unittest.h" #include "app-layer-protos.h" #include "htp/htp_rs.h" #include "util-debug.h" diff --git a/src/app-layer-htp.c b/src/app-layer-htp.c index 3033affa5b..7c9102758e 100644 --- a/src/app-layer-htp.c +++ b/src/app-layer-htp.c @@ -2699,7 +2699,6 @@ void RegisterHTPParsers(void) #include "flow-util.h" #include "stream-tcp.h" #include "util-print.h" -#include "util-unittest.h" #include "util-unittest-helper.h" static HTPCfgRec cfglist_backup; diff --git a/src/app-layer-http2.c b/src/app-layer-http2.c index 0b1697e8e4..91c247520b 100644 --- a/src/app-layer-http2.c +++ b/src/app-layer-http2.c @@ -25,7 +25,6 @@ #include "suricata-common.h" -#include "util-unittest.h" #include "app-layer-detect-proto.h" diff --git a/src/app-layer-ike.c b/src/app-layer-ike.c index bb07e5b0ac..7bc5c0e154 100644 --- a/src/app-layer-ike.c +++ b/src/app-layer-ike.c @@ -34,7 +34,6 @@ #include "app-layer-parser.h" #include "app-layer-protos.h" #include "flow.h" -#include "util-unittest.h" #include "stream-tcp.h" #include "util-unittest-helper.h" #include "flow-util.h" diff --git a/src/app-layer-modbus.c b/src/app-layer-modbus.c index f74486b4e6..a375f00d1a 100644 --- a/src/app-layer-modbus.c +++ b/src/app-layer-modbus.c @@ -57,7 +57,6 @@ #include "flow-util.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "stream-tcp.h" diff --git a/src/app-layer-nfs-tcp.c b/src/app-layer-nfs-tcp.c index 237b3295e1..57df7fdb9a 100644 --- a/src/app-layer-nfs-tcp.c +++ b/src/app-layer-nfs-tcp.c @@ -28,7 +28,6 @@ #include "suricata-common.h" -#include "util-unittest.h" #include "app-layer-detect-proto.h" diff --git a/src/app-layer-nfs-udp.c b/src/app-layer-nfs-udp.c index 430169dff4..0247db3a47 100644 --- a/src/app-layer-nfs-udp.c +++ b/src/app-layer-nfs-udp.c @@ -25,7 +25,6 @@ #include "suricata-common.h" -#include "util-unittest.h" #include "app-layer-nfs-udp.h" diff --git a/src/app-layer-smb.c b/src/app-layer-smb.c index ff8dc859d2..a99917a46a 100644 --- a/src/app-layer-smb.c +++ b/src/app-layer-smb.c @@ -31,7 +31,6 @@ #ifdef UNITTESTS #include "stream-tcp.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "app-layer-protos.h" #include "app-layer-parser.h" diff --git a/src/app-layer-smtp.c b/src/app-layer-smtp.c index a667953136..4f30c94ae4 100644 --- a/src/app-layer-smtp.c +++ b/src/app-layer-smtp.c @@ -34,7 +34,6 @@ #include "util-mpm.h" #include "util-debug.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-memcmp.h" diff --git a/src/app-layer-ssh.c b/src/app-layer-ssh.c index a7130602fb..a62a1542c5 100644 --- a/src/app-layer-ssh.c +++ b/src/app-layer-ssh.c @@ -37,7 +37,6 @@ #include "conf.h" -#include "util-unittest.h" #include "util-debug.h" #include "util-memcmp.h" diff --git a/src/app-layer.c b/src/app-layer.c index e3d314e1a2..ca076a5929 100644 --- a/src/app-layer.c +++ b/src/app-layer.c @@ -1399,7 +1399,6 @@ void AppLayerDeSetupCounters(void) /***** Unittests *****/ #ifdef UNITTESTS -#include "util-unittest.h" #define TEST_START \ Packet *p = PacketGetFromAlloc(); \ diff --git a/src/conf-yaml-loader.c b/src/conf-yaml-loader.c index a011ba697d..6e455c5453 100644 --- a/src/conf-yaml-loader.c +++ b/src/conf-yaml-loader.c @@ -29,7 +29,6 @@ #include #include "util-path.h" #include "util-debug.h" -#include "util-unittest.h" #define YAML_VERSION_MAJOR 1 #define YAML_VERSION_MINOR 1 diff --git a/src/conf.c b/src/conf.c index 4dc5118081..04486b6ee4 100644 --- a/src/conf.c +++ b/src/conf.c @@ -38,7 +38,6 @@ #include "suricata-common.h" #include "conf.h" -#include "util-unittest.h" #include "util-debug.h" #include "util-path.h" #include "util-conf.h" diff --git a/src/decode-chdlc.c b/src/decode-chdlc.c index 246a3cb208..3ad2ab8ba5 100644 --- a/src/decode-chdlc.c +++ b/src/decode-chdlc.c @@ -36,7 +36,6 @@ #include "decode-events.h" #include "util-validate.h" -#include "util-unittest.h" #include "util-debug.h" int DecodeCHDLC(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, diff --git a/src/decode-erspan.c b/src/decode-erspan.c index b87877a5ea..839cb5230a 100644 --- a/src/decode-erspan.c +++ b/src/decode-erspan.c @@ -37,7 +37,6 @@ #include "decode-erspan.h" #include "util-validate.h" -#include "util-unittest.h" #include "util-debug.h" #include "conf.h" diff --git a/src/decode-esp.c b/src/decode-esp.c index 7bed5795cd..14405844d4 100644 --- a/src/decode-esp.c +++ b/src/decode-esp.c @@ -85,7 +85,6 @@ int DecodeESP(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, const uint8_t *p #ifdef UNITTESTS -#include "util-unittest.h" /** \test Successful decoding */ static int DecodeESPTest01(void) diff --git a/src/decode-etag.c b/src/decode-etag.c index ab1e699351..915496f64c 100644 --- a/src/decode-etag.c +++ b/src/decode-etag.c @@ -38,7 +38,6 @@ #include "decode-events.h" #include "util-validate.h" -#include "util-unittest.h" #include "util-debug.h" int DecodeETag(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, const uint8_t *pkt, uint32_t len) diff --git a/src/decode-ethernet.c b/src/decode-ethernet.c index 8ada77382a..d8642210b1 100644 --- a/src/decode-ethernet.c +++ b/src/decode-ethernet.c @@ -36,7 +36,6 @@ #include "decode-events.h" #include "util-validate.h" -#include "util-unittest.h" #include "util-debug.h" int DecodeEthernet(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, diff --git a/src/decode-geneve.c b/src/decode-geneve.c index 37257fd1c9..1e88e05bd6 100644 --- a/src/decode-geneve.c +++ b/src/decode-geneve.c @@ -37,7 +37,6 @@ #include "flow.h" #include "util-validate.h" -#include "util-unittest.h" #include "util-debug.h" #include "pkt-var.h" diff --git a/src/decode-gre.c b/src/decode-gre.c index 7045cdf20f..e97c1554a5 100644 --- a/src/decode-gre.c +++ b/src/decode-gre.c @@ -37,7 +37,6 @@ #include "decode-gre.h" #include "util-validate.h" -#include "util-unittest.h" #include "util-debug.h" /** diff --git a/src/decode-icmpv4.c b/src/decode-icmpv4.c index 53507a8bc4..6e3bf0e376 100644 --- a/src/decode-icmpv4.c +++ b/src/decode-icmpv4.c @@ -39,7 +39,6 @@ #include "flow.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" #include "util-print.h" diff --git a/src/decode-mpls.c b/src/decode-mpls.c index 1eb8fb92c3..435ed774b1 100644 --- a/src/decode-mpls.c +++ b/src/decode-mpls.c @@ -27,7 +27,6 @@ #include "decode.h" #include "util-validate.h" -#include "util-unittest.h" #define MPLS_HEADER_LEN 4 #define MPLS_PW_LEN 4 diff --git a/src/decode-nsh.c b/src/decode-nsh.c index ec615cb74c..afc5d684ba 100644 --- a/src/decode-nsh.c +++ b/src/decode-nsh.c @@ -36,7 +36,6 @@ #include "decode-nsh.h" #include "util-validate.h" -#include "util-unittest.h" #include "util-debug.h" /** diff --git a/src/decode-null.c b/src/decode-null.c index c38e3130bc..2438ba38ce 100644 --- a/src/decode-null.c +++ b/src/decode-null.c @@ -36,7 +36,6 @@ #include "decode-events.h" #include "util-validate.h" -#include "util-unittest.h" #include "util-debug.h" #define HDR_SIZE 4 diff --git a/src/decode-ppp.c b/src/decode-ppp.c index 87a220d361..4de1047aec 100644 --- a/src/decode-ppp.c +++ b/src/decode-ppp.c @@ -37,7 +37,6 @@ #include "flow.h" #include "util-validate.h" -#include "util-unittest.h" #include "util-debug.h" static int DecodePPPCompressedProto(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, diff --git a/src/decode-pppoe.c b/src/decode-pppoe.c index 0b1f6d1af4..11da064a1b 100644 --- a/src/decode-pppoe.c +++ b/src/decode-pppoe.c @@ -40,7 +40,6 @@ #include "flow.h" #include "util-validate.h" -#include "util-unittest.h" #include "util-debug.h" /** diff --git a/src/decode-raw.c b/src/decode-raw.c index 4f6cdc377d..632b17f31e 100644 --- a/src/decode-raw.c +++ b/src/decode-raw.c @@ -36,7 +36,6 @@ #include "decode-events.h" #include "util-validate.h" -#include "util-unittest.h" #include "util-debug.h" int DecodeRaw(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, diff --git a/src/decode-sctp.c b/src/decode-sctp.c index 33ac24c0d2..dff99a0fbd 100644 --- a/src/decode-sctp.c +++ b/src/decode-sctp.c @@ -35,7 +35,6 @@ #include "decode-events.h" #include "util-validate.h" -#include "util-unittest.h" #include "util-debug.h" #include "flow.h" diff --git a/src/decode-tcp.c b/src/decode-tcp.c index 745ab7b1d3..9fa61fe104 100644 --- a/src/decode-tcp.c +++ b/src/decode-tcp.c @@ -34,7 +34,6 @@ #include "decode-tcp.h" #include "decode.h" #include "decode-events.h" -#include "util-unittest.h" #include "util-debug.h" #include "flow.h" diff --git a/src/decode-udp.c b/src/decode-udp.c index 1d72e1fbc8..0e2d4425ef 100644 --- a/src/decode-udp.c +++ b/src/decode-udp.c @@ -37,7 +37,6 @@ #include "decode-teredo.h" #include "decode-vxlan.h" #include "decode-events.h" -#include "util-unittest.h" #include "util-debug.h" #include "flow.h" #include "app-layer.h" diff --git a/src/decode-vlan.c b/src/decode-vlan.c index beb3042909..7341d45dde 100644 --- a/src/decode-vlan.c +++ b/src/decode-vlan.c @@ -36,7 +36,6 @@ #include "decode-events.h" #include "util-validate.h" -#include "util-unittest.h" #include "util-debug.h" /** diff --git a/src/decode-vntag.c b/src/decode-vntag.c index ca7cbd9c26..8cfa70437a 100644 --- a/src/decode-vntag.c +++ b/src/decode-vntag.c @@ -35,7 +35,6 @@ #include "decode-events.h" #include "util-validate.h" -#include "util-unittest.h" #include "util-debug.h" /** diff --git a/src/decode-vxlan.c b/src/decode-vxlan.c index a0920509a8..b3f789a349 100644 --- a/src/decode-vxlan.c +++ b/src/decode-vxlan.c @@ -37,7 +37,6 @@ #include "flow.h" #include "util-validate.h" -#include "util-unittest.h" #include "util-debug.h" #define VXLAN_HEADER_LEN sizeof(VXLANHeader) diff --git a/src/defrag.c b/src/defrag.c index d0ba958ab9..1562045875 100644 --- a/src/defrag.c +++ b/src/defrag.c @@ -58,7 +58,6 @@ #include "decode.h" #ifdef UNITTESTS -#include "util-unittest.h" #endif #define DEFAULT_DEFRAG_HASH_SIZE 0xffff diff --git a/src/detect-app-layer-event.c b/src/detect-app-layer-event.c index ddd499806a..8b961f106e 100644 --- a/src/detect-app-layer-event.c +++ b/src/detect-app-layer-event.c @@ -46,7 +46,6 @@ #include "util-debug.h" #include "util-enum.h" #include "util-profiling.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "stream-tcp-util.h" diff --git a/src/detect-app-layer-protocol.c b/src/detect-app-layer-protocol.c index df5306114e..b896f8a861 100644 --- a/src/detect-app-layer-protocol.c +++ b/src/detect-app-layer-protocol.c @@ -32,7 +32,6 @@ #include "app-layer-parser.h" #include "app-layer-detect-proto.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #ifdef UNITTESTS diff --git a/src/detect-app-layer-state.c b/src/detect-app-layer-state.c index 49b137ce7f..3e87e69aed 100644 --- a/src/detect-app-layer-state.c +++ b/src/detect-app-layer-state.c @@ -45,7 +45,6 @@ #include "util-debug.h" #include "util-enum.h" #include "util-profiling.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "stream-tcp-util.h" diff --git a/src/detect-asn1.c b/src/detect-asn1.c index f0f160748c..e8abad77fd 100644 --- a/src/detect-asn1.c +++ b/src/detect-asn1.c @@ -31,7 +31,6 @@ #include "flow.h" #include "detect-asn1.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-byte.h" #include "util-debug.h" diff --git a/src/detect-base64-data.c b/src/detect-base64-data.c index c6bafe29b2..5354a7423b 100644 --- a/src/detect-base64-data.c +++ b/src/detect-base64-data.c @@ -23,7 +23,6 @@ #include "detect-base64-data.h" #include "detect-engine-build.h" -#include "util-unittest.h" static int DetectBase64DataSetup(DetectEngineCtx *, Signature *, const char *); #ifdef UNITTESTS diff --git a/src/detect-base64-decode.c b/src/detect-base64-decode.c index 34b7cfc8c2..73c31e688b 100644 --- a/src/detect-base64-decode.c +++ b/src/detect-base64-decode.c @@ -251,7 +251,6 @@ static void DetectBase64DecodeFree(DetectEngineCtx *de_ctx, void *ptr) #ifdef UNITTESTS #include "detect-engine.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "app-layer-parser.h" #include "flow-util.h" diff --git a/src/detect-bsize.c b/src/detect-bsize.c index 728328272f..a1efa65714 100644 --- a/src/detect-bsize.c +++ b/src/detect-bsize.c @@ -24,7 +24,6 @@ */ #include "suricata-common.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "detect.h" diff --git a/src/detect-bypass.c b/src/detect-bypass.c index 61f93c0564..3871945b32 100644 --- a/src/detect-bypass.c +++ b/src/detect-bypass.c @@ -45,7 +45,6 @@ #include "util-debug.h" #include "util-spm-bm.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-device-private.h" diff --git a/src/detect-byte-extract.c b/src/detect-byte-extract.c index bcd98ae83a..c51dbfcdef 100644 --- a/src/detect-byte-extract.c +++ b/src/detect-byte-extract.c @@ -40,7 +40,6 @@ #include "util-byte.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" /* the base to be used if string mode is specified. These options would be diff --git a/src/detect-bytejump.c b/src/detect-bytejump.c index 65cd194074..a5de6cb389 100644 --- a/src/detect-bytejump.c +++ b/src/detect-bytejump.c @@ -38,7 +38,6 @@ #include "detect-uricontent.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-debug.h" #include "util-validate.h" #include "detect-pcre.h" diff --git a/src/detect-bytemath.c b/src/detect-bytemath.c index b5c33e699d..1798d6f840 100644 --- a/src/detect-bytemath.c +++ b/src/detect-bytemath.c @@ -52,7 +52,6 @@ #include "util-byte.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-spm.h" diff --git a/src/detect-bytetest.c b/src/detect-bytetest.c index a7ae4c9c20..5c5889471d 100644 --- a/src/detect-bytetest.c +++ b/src/detect-bytetest.c @@ -41,7 +41,6 @@ #include "app-layer.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-debug.h" #include "detect-pcre.h" diff --git a/src/detect-classtype.c b/src/detect-classtype.c index 1ff4654fff..43be7d6cfd 100644 --- a/src/detect-classtype.c +++ b/src/detect-classtype.c @@ -34,7 +34,6 @@ #include "util-classification-config.h" #include "util-error.h" #include "util-debug.h" -#include "util-unittest.h" #define PARSE_REGEX "^\\s*([a-zA-Z][a-zA-Z0-9-_]*)\\s*$" diff --git a/src/detect-config.c b/src/detect-config.c index 7fa2f4f11c..b6377fa777 100644 --- a/src/detect-config.c +++ b/src/detect-config.c @@ -40,7 +40,6 @@ #include "util-debug.h" #include "util-spm-bm.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "app-layer.h" diff --git a/src/detect-content.c b/src/detect-content.c index ee81120c5b..b93ff603f6 100644 --- a/src/detect-content.c +++ b/src/detect-content.c @@ -41,7 +41,6 @@ #include "flow-var.h" #include "detect-flow.h" #include "app-layer.h" -#include "util-unittest.h" #include "util-print.h" #include "util-debug.h" #include "util-spm.h" diff --git a/src/detect-csum.c b/src/detect-csum.c index 7139dea587..a50b91fa54 100644 --- a/src/detect-csum.c +++ b/src/detect-csum.c @@ -31,7 +31,6 @@ #include "detect-csum.h" -#include "util-unittest.h" #include "util-debug.h" #include "pkt-var.h" diff --git a/src/detect-detection-filter.c b/src/detect-detection-filter.c index a2d3330765..75bc583f89 100644 --- a/src/detect-detection-filter.c +++ b/src/detect-detection-filter.c @@ -35,7 +35,6 @@ #include "detect-parse.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" #include "detect-engine-build.h" diff --git a/src/detect-distance.c b/src/detect-distance.c index ba1cfcc683..fa69d9984b 100644 --- a/src/detect-distance.c +++ b/src/detect-distance.c @@ -44,7 +44,6 @@ #include "util-byte.h" #include "util-debug.h" -#include "util-unittest.h" #include "detect-bytejump.h" #include "util-unittest-helper.h" diff --git a/src/detect-dnp3.c b/src/detect-dnp3.c index f35989feda..812d10a8de 100644 --- a/src/detect-dnp3.c +++ b/src/detect-dnp3.c @@ -384,7 +384,6 @@ void DetectDNP3Register(void) #ifdef UNITTESTS -#include "util-unittest.h" #include "util-unittest-helper.h" #include "app-layer-parser.h" #include "flow-util.h" diff --git a/src/detect-dsize.c b/src/detect-dsize.c index 5c2882b5c3..0a45917c24 100644 --- a/src/detect-dsize.c +++ b/src/detect-dsize.c @@ -36,7 +36,6 @@ #include "detect-content.h" #include "detect-dsize.h" -#include "util-unittest.h" #include "util-debug.h" #include "util-byte.h" diff --git a/src/detect-engine-address-ipv4.c b/src/detect-engine-address-ipv4.c index f1b12e755f..9320a507f7 100644 --- a/src/detect-engine-address-ipv4.c +++ b/src/detect-engine-address-ipv4.c @@ -30,7 +30,6 @@ #include "flow-var.h" #include "util-cidr.h" -#include "util-unittest.h" #include "detect-engine-address.h" #include "detect-engine-address-ipv4.h" diff --git a/src/detect-engine-address-ipv6.c b/src/detect-engine-address-ipv6.c index 5e12ecc711..7b9ecf2a43 100644 --- a/src/detect-engine-address-ipv6.c +++ b/src/detect-engine-address-ipv6.c @@ -30,7 +30,6 @@ #include "flow-var.h" #include "util-cidr.h" -#include "util-unittest.h" #include "detect-engine-address.h" #include "detect-engine-address-ipv6.h" diff --git a/src/detect-engine-address.c b/src/detect-engine-address.c index b42a454654..71e1b7d6d4 100644 --- a/src/detect-engine-address.c +++ b/src/detect-engine-address.c @@ -29,7 +29,6 @@ #include "flow-var.h" #include "util-cidr.h" -#include "util-unittest.h" #include "util-rule-vars.h" #include "conf.h" #include "conf-yaml-loader.h" diff --git a/src/detect-engine-content-inspection.c b/src/detect-engine-content-inspection.c index cb80f3bd7e..2fe5bcaf3d 100644 --- a/src/detect-engine-content-inspection.c +++ b/src/detect-engine-content-inspection.c @@ -59,7 +59,6 @@ #include "util-print.h" #include "util-validate.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-profiling.h" diff --git a/src/detect-engine-event.c b/src/detect-engine-event.c index 199705ba77..1b9cd8cb14 100644 --- a/src/detect-engine-event.c +++ b/src/detect-engine-event.c @@ -42,7 +42,6 @@ /* Need to get the DEvents[] array */ #include "detect-engine-event.h" -#include "util-unittest.h" #define PARSE_REGEX "\\S[0-9A-z_]+[.][A-z0-9_+.]+$" diff --git a/src/detect-engine-file.c b/src/detect-engine-file.c index 4903cb36f4..c5b6f5d8aa 100644 --- a/src/detect-engine-file.c +++ b/src/detect-engine-file.c @@ -43,7 +43,6 @@ #include "app-layer-htp.h" #include "app-layer-smtp.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-profiling.h" #include "util-validate.h" diff --git a/src/detect-engine-iponly.c b/src/detect-engine-iponly.c index b410f7aa96..ae893753b1 100644 --- a/src/detect-engine-iponly.c +++ b/src/detect-engine-iponly.c @@ -51,7 +51,6 @@ #include "flow-util.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-print.h" #include "util-byte.h" diff --git a/src/detect-engine-payload.c b/src/detect-engine-payload.c index 0a201cb1ab..ede9ad241d 100644 --- a/src/detect-engine-payload.c +++ b/src/detect-engine-payload.c @@ -44,7 +44,6 @@ #include "util-debug.h" #include "util-print.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-validate.h" #include "util-profiling.h" diff --git a/src/detect-engine-port.c b/src/detect-engine-port.c index 6d8dc43cb8..96506946cc 100644 --- a/src/detect-engine-port.c +++ b/src/detect-engine-port.c @@ -32,7 +32,6 @@ #include "flow-var.h" #include "util-cidr.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-rule-vars.h" diff --git a/src/detect-engine-proto.c b/src/detect-engine-proto.c index b162136d88..aa62f1c39a 100644 --- a/src/detect-engine-proto.c +++ b/src/detect-engine-proto.c @@ -40,7 +40,6 @@ #include "util-cidr.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" diff --git a/src/detect-engine-register.c b/src/detect-engine-register.c index ac4866f9f9..23a1c4d0e5 100644 --- a/src/detect-engine-register.c +++ b/src/detect-engine-register.c @@ -248,7 +248,6 @@ #include "util-classification-config.h" #include "util-threshold-config.h" #include "util-print.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" #include "util-hashlist.h" diff --git a/src/detect-engine-siggroup.c b/src/detect-engine-siggroup.c index 79ecb9e8ba..1d0a9d8c9e 100644 --- a/src/detect-engine-siggroup.c +++ b/src/detect-engine-siggroup.c @@ -50,7 +50,6 @@ #include "util-debug.h" #include "util-validate.h" #include "util-cidr.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-memcmp.h" diff --git a/src/detect-engine-sigorder.c b/src/detect-engine-sigorder.c index 98012cf9d3..e233d28f0a 100644 --- a/src/detect-engine-sigorder.c +++ b/src/detect-engine-sigorder.c @@ -33,7 +33,6 @@ #include "detect-pcre.h" #include "detect-engine-build.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" #include "util-action.h" diff --git a/src/detect-engine-state.c b/src/detect-engine-state.c index 2bd725ea05..76df16cb14 100644 --- a/src/detect-engine-state.c +++ b/src/detect-engine-state.c @@ -57,7 +57,6 @@ #include "app-layer-protos.h" #include "app-layer-htp.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-profiling.h" diff --git a/src/detect-engine-tag.c b/src/detect-engine-tag.c index ddcd69b7e9..228004a4a6 100644 --- a/src/detect-engine-tag.c +++ b/src/detect-engine-tag.c @@ -36,7 +36,6 @@ #include "host-storage.h" #include "flow-storage.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "flow-util.h" #include "stream-tcp-private.h" diff --git a/src/detect-engine.c b/src/detect-engine.c index 894fde126c..f8ce5d9cf3 100644 --- a/src/detect-engine.c +++ b/src/detect-engine.c @@ -74,7 +74,6 @@ #include "util-hash.h" #include "util-byte.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-action.h" #include "util-magic.h" #include "util-signal.h" diff --git a/src/detect-fast-pattern.c b/src/detect-fast-pattern.c index 4f4366e7d9..0f048f57a7 100644 --- a/src/detect-fast-pattern.c +++ b/src/detect-fast-pattern.c @@ -36,7 +36,6 @@ #include "util-error.h" #include "util-byte.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #define PARSE_REGEX "^(\\s*only\\s*)|\\s*([0-9]+)\\s*,\\s*([0-9]+)\\s*$" diff --git a/src/detect-file-data.c b/src/detect-file-data.c index ef9911ac21..293b826c73 100644 --- a/src/detect-file-data.c +++ b/src/detect-file-data.c @@ -49,7 +49,6 @@ #include "util-debug.h" #include "util-spm-bm.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-file-decompression.h" #include "util-profiling.h" diff --git a/src/detect-filemagic.c b/src/detect-filemagic.c index 88c0d90074..336edc9204 100644 --- a/src/detect-filemagic.c +++ b/src/detect-filemagic.c @@ -46,7 +46,6 @@ #include "util-magic.h" #include "util-print.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-profiling.h" diff --git a/src/detect-filemd5.c b/src/detect-filemd5.c index 12517df103..3eb1e2ac15 100644 --- a/src/detect-filemd5.c +++ b/src/detect-filemd5.c @@ -26,7 +26,6 @@ #include "detect-engine.h" #include "detect-file-hash-common.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "detect-filemd5.h" diff --git a/src/detect-filename.c b/src/detect-filename.c index 4490502fbe..ad5484b641 100644 --- a/src/detect-filename.c +++ b/src/detect-filename.c @@ -47,7 +47,6 @@ #include "util-debug.h" #include "util-spm-bm.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-profiling.h" diff --git a/src/detect-filesha1.c b/src/detect-filesha1.c index 069cd4b18b..a24b38f2bd 100644 --- a/src/detect-filesha1.c +++ b/src/detect-filesha1.c @@ -27,7 +27,6 @@ #include "detect-engine.h" #include "detect-file-hash-common.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "detect-filesha1.h" diff --git a/src/detect-filesha256.c b/src/detect-filesha256.c index b9d2d36aa5..ed4dd0d1f6 100644 --- a/src/detect-filesha256.c +++ b/src/detect-filesha256.c @@ -27,7 +27,6 @@ #include "detect-engine.h" #include "detect-file-hash-common.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "detect-filesha256.h" diff --git a/src/detect-filesize.c b/src/detect-filesize.c index d0c40e94e5..da5b7b506f 100644 --- a/src/detect-filesize.c +++ b/src/detect-filesize.c @@ -26,7 +26,6 @@ #include "suricata-common.h" #include "app-layer-protos.h" #include "app-layer-htp.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-misc.h" diff --git a/src/detect-filestore.c b/src/detect-filestore.c index 537e4421a2..1da0fa889b 100644 --- a/src/detect-filestore.c +++ b/src/detect-filestore.c @@ -42,7 +42,6 @@ #include "util-debug.h" #include "util-spm-bm.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "app-layer.h" diff --git a/src/detect-flow.c b/src/detect-flow.c index a644bcaa92..144f82f07b 100644 --- a/src/detect-flow.c +++ b/src/detect-flow.c @@ -37,7 +37,6 @@ #include "detect-flow.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" diff --git a/src/detect-flowbits.c b/src/detect-flowbits.c index 9876912bb1..6c29906262 100644 --- a/src/detect-flowbits.c +++ b/src/detect-flowbits.c @@ -49,7 +49,6 @@ #include "util-enum.h" #include "util-var-name.h" -#include "util-unittest.h" #include "util-debug.h" #include "util-conf.h" diff --git a/src/detect-flowint.c b/src/detect-flowint.c index efc1054683..0eeac653d7 100644 --- a/src/detect-flowint.c +++ b/src/detect-flowint.c @@ -34,7 +34,6 @@ #include "util-spm.h" #include "util-var-name.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "detect-parse.h" diff --git a/src/detect-fragbits.c b/src/detect-fragbits.c index e6f95b736f..2e12d2c0d5 100644 --- a/src/detect-fragbits.c +++ b/src/detect-fragbits.c @@ -41,7 +41,6 @@ #include "app-layer-detect-proto.h" #include "detect-fragbits.h" -#include "util-unittest.h" #include "util-debug.h" #include "pkt-var.h" diff --git a/src/detect-fragoffset.c b/src/detect-fragoffset.c index 34b141abda..6c495c1934 100644 --- a/src/detect-fragoffset.c +++ b/src/detect-fragoffset.c @@ -37,7 +37,6 @@ #include "detect-fragoffset.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-debug.h" static int DetectFragOffsetMatch(DetectEngineThreadCtx *, diff --git a/src/detect-frame.c b/src/detect-frame.c index ddb73808df..66f3b0449f 100644 --- a/src/detect-frame.c +++ b/src/detect-frame.c @@ -45,7 +45,6 @@ #include "conf-yaml-loader.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-spm.h" #include "util-print.h" diff --git a/src/detect-ftpbounce.c b/src/detect-ftpbounce.c index 8067f85c85..d4ce9f9fa8 100644 --- a/src/detect-ftpbounce.c +++ b/src/detect-ftpbounce.c @@ -36,7 +36,6 @@ #include "app-layer.h" #include "app-layer-parser.h" #include "app-layer-ftp.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" #include "flow.h" diff --git a/src/detect-ftpdata.c b/src/detect-ftpdata.c index d6c03940ba..0089507e73 100644 --- a/src/detect-ftpdata.c +++ b/src/detect-ftpdata.c @@ -24,7 +24,6 @@ */ #include "suricata-common.h" -#include "util-unittest.h" #include "detect-parse.h" #include "detect-engine.h" diff --git a/src/detect-geoip.c b/src/detect-geoip.c index 95d33c4727..4c52f95e6b 100644 --- a/src/detect-geoip.c +++ b/src/detect-geoip.c @@ -35,7 +35,6 @@ #include "detect-geoip.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #ifndef HAVE_GEOIP diff --git a/src/detect-gid.c b/src/detect-gid.c index c4ab77db73..dbcb5f6ceb 100644 --- a/src/detect-gid.c +++ b/src/detect-gid.c @@ -34,7 +34,6 @@ #include "detect-gid.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-debug.h" static int DetectGidSetup (DetectEngineCtx *, Signature *, const char *); diff --git a/src/detect-hostbits.c b/src/detect-hostbits.c index 9ed74569da..9d1bab49c3 100644 --- a/src/detect-hostbits.c +++ b/src/detect-hostbits.c @@ -46,7 +46,6 @@ #include "flow-bit.h" #include "host-bit.h" #include "util-var-name.h" -#include "util-unittest.h" #include "util-debug.h" /* diff --git a/src/detect-http-client-body.c b/src/detect-http-client-body.c index 7045a0edec..44a03c2208 100644 --- a/src/detect-http-client-body.c +++ b/src/detect-http-client-body.c @@ -52,7 +52,6 @@ #include "flow-util.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-spm.h" diff --git a/src/detect-http-cookie.c b/src/detect-http-cookie.c index ae524ea787..6b44f3a575 100644 --- a/src/detect-http-cookie.c +++ b/src/detect-http-cookie.c @@ -49,7 +49,6 @@ #include "util-debug.h" #include "util-error.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-spm.h" #include "util-print.h" diff --git a/src/detect-http-header-common.c b/src/detect-http-header-common.c index 7c03b98c04..90b70987cd 100644 --- a/src/detect-http-header-common.c +++ b/src/detect-http-header-common.c @@ -41,7 +41,6 @@ #include "flow-util.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-spm.h" #include "util-print.h" diff --git a/src/detect-http-header-names.c b/src/detect-http-header-names.c index c4846e5ab5..262b45a957 100644 --- a/src/detect-http-header-names.c +++ b/src/detect-http-header-names.c @@ -52,7 +52,6 @@ #include "flow-util.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-spm.h" #include "util-print.h" diff --git a/src/detect-http-host.c b/src/detect-http-host.c index db3af083cf..8fd1bcd939 100644 --- a/src/detect-http-host.c +++ b/src/detect-http-host.c @@ -48,7 +48,6 @@ #include "flow-util.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-spm.h" diff --git a/src/detect-http-method.c b/src/detect-http-method.c index 95182b0f37..fc016f437f 100644 --- a/src/detect-http-method.c +++ b/src/detect-http-method.c @@ -48,7 +48,6 @@ #include "flow-util.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-spm.h" diff --git a/src/detect-http-protocol.c b/src/detect-http-protocol.c index 3a7b98be30..d253bf00ac 100644 --- a/src/detect-http-protocol.c +++ b/src/detect-http-protocol.c @@ -52,7 +52,6 @@ #include "flow-util.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-spm.h" #include "util-print.h" diff --git a/src/detect-http-request-line.c b/src/detect-http-request-line.c index 85f0016519..e30bd39c9a 100644 --- a/src/detect-http-request-line.c +++ b/src/detect-http-request-line.c @@ -50,7 +50,6 @@ #include "flow-util.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-spm.h" diff --git a/src/detect-http-response-line.c b/src/detect-http-response-line.c index 28326a401c..d275178c1a 100644 --- a/src/detect-http-response-line.c +++ b/src/detect-http-response-line.c @@ -50,7 +50,6 @@ #include "flow-util.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-spm.h" diff --git a/src/detect-http-server-body.c b/src/detect-http-server-body.c index 31a0d47614..c1a23d5c66 100644 --- a/src/detect-http-server-body.c +++ b/src/detect-http-server-body.c @@ -45,7 +45,6 @@ #include "flow.h" #include "flow-util.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-profiling.h" diff --git a/src/detect-http-start.c b/src/detect-http-start.c index 72a3b56d57..3c82ba4db7 100644 --- a/src/detect-http-start.c +++ b/src/detect-http-start.c @@ -51,7 +51,6 @@ #include "flow-util.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-spm.h" #include "util-print.h" diff --git a/src/detect-http-stat-code.c b/src/detect-http-stat-code.c index 392fb95c25..04fe4ec01f 100644 --- a/src/detect-http-stat-code.c +++ b/src/detect-http-stat-code.c @@ -50,7 +50,6 @@ #include "util-debug.h" #include "util-error.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-spm.h" #include "util-print.h" diff --git a/src/detect-http-stat-msg.c b/src/detect-http-stat-msg.c index 10edb52873..35377e8482 100644 --- a/src/detect-http-stat-msg.c +++ b/src/detect-http-stat-msg.c @@ -50,7 +50,6 @@ #include "util-debug.h" #include "util-error.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-spm.h" #include "util-print.h" diff --git a/src/detect-http-ua.c b/src/detect-http-ua.c index 42b82b9c3b..3e1090dc5b 100644 --- a/src/detect-http-ua.c +++ b/src/detect-http-ua.c @@ -49,7 +49,6 @@ #include "flow-util.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-spm.h" diff --git a/src/detect-http-uri.c b/src/detect-http-uri.c index d3b6b28f82..3a8cc8c2a1 100644 --- a/src/detect-http-uri.c +++ b/src/detect-http-uri.c @@ -47,7 +47,6 @@ #include "flow-var.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-spm.h" #include "util-print.h" diff --git a/src/detect-icmp-id.c b/src/detect-icmp-id.c index 52db2eb243..86979cebd5 100644 --- a/src/detect-icmp-id.c +++ b/src/detect-icmp-id.c @@ -36,7 +36,6 @@ #include "detect-icmp-id.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" diff --git a/src/detect-icmp-seq.c b/src/detect-icmp-seq.c index 2b00cddc6c..9475272d10 100644 --- a/src/detect-icmp-seq.c +++ b/src/detect-icmp-seq.c @@ -35,7 +35,6 @@ #include "detect-icmp-seq.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" diff --git a/src/detect-icode.c b/src/detect-icode.c index 8dcb83b64b..2b30168b3e 100644 --- a/src/detect-icode.c +++ b/src/detect-icode.c @@ -35,7 +35,6 @@ #include "detect-icode.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" diff --git a/src/detect-id.c b/src/detect-id.c index 6fdb50b86a..970d76778b 100644 --- a/src/detect-id.c +++ b/src/detect-id.c @@ -39,7 +39,6 @@ #include "util-debug.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-unittest-helper.h" /** diff --git a/src/detect-igmp-type.c b/src/detect-igmp-type.c index fd7765a1dc..6ada2ce104 100644 --- a/src/detect-igmp-type.c +++ b/src/detect-igmp-type.c @@ -33,7 +33,6 @@ #include "detect-engine-uint.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" diff --git a/src/detect-ipopts.c b/src/detect-ipopts.c index 117bf11fd8..2e4b24a8b6 100644 --- a/src/detect-ipopts.c +++ b/src/detect-ipopts.c @@ -30,7 +30,6 @@ #include "detect-parse.h" #include "detect-ipopts.h" -#include "util-unittest.h" #include "util-unittest-helper.h" static int DetectIpOptsMatch (DetectEngineThreadCtx *, Packet *, diff --git a/src/detect-ipproto.c b/src/detect-ipproto.c index 22b5624f34..97c5da3bde 100644 --- a/src/detect-ipproto.c +++ b/src/detect-ipproto.c @@ -39,7 +39,6 @@ #include "util-byte.h" #include "util-proto-name.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" diff --git a/src/detect-iprep.c b/src/detect-iprep.c index d2c66ca14e..6538dd3cad 100644 --- a/src/detect-iprep.c +++ b/src/detect-iprep.c @@ -44,7 +44,6 @@ #include "util-debug.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-fmemopen.h" #include "util-validate.h" diff --git a/src/detect-isdataat.c b/src/detect-isdataat.c index 877a38bcf2..bcda4f7b34 100644 --- a/src/detect-isdataat.c +++ b/src/detect-isdataat.c @@ -31,7 +31,6 @@ #include "detect-parse.h" #include "app-layer.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "detect-isdataat.h" diff --git a/src/detect-itype.c b/src/detect-itype.c index d9f48a44ca..e43f3958b5 100644 --- a/src/detect-itype.c +++ b/src/detect-itype.c @@ -35,7 +35,6 @@ #include "detect-engine-uint.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" diff --git a/src/detect-l3proto.c b/src/detect-l3proto.c index 69edb46f99..5dcddd4150 100644 --- a/src/detect-l3proto.c +++ b/src/detect-l3proto.c @@ -41,7 +41,6 @@ #include "detect-l3proto.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" diff --git a/src/detect-lua.c b/src/detect-lua.c index 6c0c11e657..39b8232558 100644 --- a/src/detect-lua.c +++ b/src/detect-lua.c @@ -43,7 +43,6 @@ #include "util-byte.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "app-layer.h" diff --git a/src/detect-mark.c b/src/detect-mark.c index f5e5597e5c..2e06bb689d 100644 --- a/src/detect-mark.c +++ b/src/detect-mark.c @@ -34,7 +34,6 @@ #include "detect-mark.h" #include "detect-parse.h" -#include "util-unittest.h" #include "util-byte.h" #include "util-debug.h" diff --git a/src/detect-metadata.c b/src/detect-metadata.c index 9a03889e68..5589bf241c 100644 --- a/src/detect-metadata.c +++ b/src/detect-metadata.c @@ -32,7 +32,6 @@ #include "detect-engine.h" #include "detect-metadata.h" #include "util-hash-string.h" -#include "util-unittest.h" #include "rust.h" #include "util-validate.h" diff --git a/src/detect-msg.c b/src/detect-msg.c index 8116d483e6..aa9034f3f2 100644 --- a/src/detect-msg.c +++ b/src/detect-msg.c @@ -27,7 +27,6 @@ #include "detect.h" #include "util-classification-config.h" #include "util-debug.h" -#include "util-unittest.h" #include "detect-parse.h" #include "detect-engine.h" diff --git a/src/detect-parse.c b/src/detect-parse.c index 2030468f39..8453dc5a8d 100644 --- a/src/detect-parse.c +++ b/src/detect-parse.c @@ -63,7 +63,6 @@ #include "app-layer-htp.h" #include "util-classification-config.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" #include "string.h" diff --git a/src/detect-pcre.c b/src/detect-pcre.c index a361ab7c7d..c108425242 100644 --- a/src/detect-pcre.c +++ b/src/detect-pcre.c @@ -46,7 +46,6 @@ #include "util-var-name.h" #include "util-unittest-helper.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-print.h" #include "util-pool.h" diff --git a/src/detect-pkt-data.c b/src/detect-pkt-data.c index 80673979ad..e56a2251aa 100644 --- a/src/detect-pkt-data.c +++ b/src/detect-pkt-data.c @@ -39,7 +39,6 @@ #include "util-debug.h" #include "util-spm-bm.h" -#include "util-unittest.h" #include "util-unittest-helper.h" static int DetectPktDataSetup (DetectEngineCtx *, Signature *, const char *); diff --git a/src/detect-priority.c b/src/detect-priority.c index facd0e82d3..55e4f34eb1 100644 --- a/src/detect-priority.c +++ b/src/detect-priority.c @@ -32,7 +32,6 @@ #include "detect-engine-mpm.h" #include "util-error.h" #include "util-debug.h" -#include "util-unittest.h" #define PARSE_REGEX "^\\s*(\\d+|\"\\d+\")\\s*$" diff --git a/src/detect-reference.c b/src/detect-reference.c index 04820d8844..383115af91 100644 --- a/src/detect-reference.c +++ b/src/detect-reference.c @@ -39,7 +39,6 @@ #include "util-reference-config.h" #include "detect-reference.h" -#include "util-unittest.h" #include "util-byte.h" #include "util-debug.h" diff --git a/src/detect-replace.c b/src/detect-replace.c index 66bc1ff69e..7fc23e20e2 100644 --- a/src/detect-replace.c +++ b/src/detect-replace.c @@ -44,7 +44,6 @@ #include "util-checksum.h" -#include "util-unittest.h" #include "util-debug.h" diff --git a/src/detect-rev.c b/src/detect-rev.c index 6b247561d5..3ab8932347 100644 --- a/src/detect-rev.c +++ b/src/detect-rev.c @@ -31,7 +31,6 @@ #include "util-byte.h" #include "util-debug.h" #include "util-error.h" -#include "util-unittest.h" static int DetectRevSetup (DetectEngineCtx *, Signature *, const char *); #ifdef UNITTESTS diff --git a/src/detect-rpc.c b/src/detect-rpc.c index 179e53fd43..3f86fa4941 100644 --- a/src/detect-rpc.c +++ b/src/detect-rpc.c @@ -35,7 +35,6 @@ #include "detect-engine-address.h" #include "detect-engine-build.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" #include "util-byte.h" diff --git a/src/detect-sameip.c b/src/detect-sameip.c index bae4182562..231f3d18e4 100644 --- a/src/detect-sameip.c +++ b/src/detect-sameip.c @@ -34,7 +34,6 @@ #include "detect-sameip.h" -#include "util-unittest.h" #include "util-unittest-helper.h" static int DetectSameipMatch(DetectEngineThreadCtx *, Packet *, diff --git a/src/detect-sid.c b/src/detect-sid.c index 1d65f56938..0539292001 100644 --- a/src/detect-sid.c +++ b/src/detect-sid.c @@ -31,7 +31,6 @@ #include "util-byte.h" #include "util-debug.h" #include "util-error.h" -#include "util-unittest.h" static int DetectSidSetup (DetectEngineCtx *, Signature *, const char *); #ifdef UNITTESTS diff --git a/src/detect-sip-method.c b/src/detect-sip-method.c index d75250e6b0..c50ab3837c 100644 --- a/src/detect-sip-method.c +++ b/src/detect-sip-method.c @@ -41,7 +41,6 @@ #include "flow-util.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-spm.h" diff --git a/src/detect-sip-uri.c b/src/detect-sip-uri.c index d41b320174..6cd6a7391a 100644 --- a/src/detect-sip-uri.c +++ b/src/detect-sip-uri.c @@ -42,7 +42,6 @@ #include "flow-util.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-spm.h" diff --git a/src/detect-ssl-state.c b/src/detect-ssl-state.c index aea347b93a..8fa1313878 100644 --- a/src/detect-ssl-state.c +++ b/src/detect-ssl-state.c @@ -39,7 +39,6 @@ #include "flow-util.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "app-layer.h" diff --git a/src/detect-ssl-version.c b/src/detect-ssl-version.c index 751777d6e1..0433b38507 100644 --- a/src/detect-ssl-version.c +++ b/src/detect-ssl-version.c @@ -39,7 +39,6 @@ #include "flow-util.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "app-layer.h" diff --git a/src/detect-stream_size.c b/src/detect-stream_size.c index 56a627684d..b021253cc9 100644 --- a/src/detect-stream_size.c +++ b/src/detect-stream_size.c @@ -25,7 +25,6 @@ #include "suricata-common.h" #include "stream-tcp.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "detect.h" diff --git a/src/detect-tag.c b/src/detect-tag.c index 63d2bb6718..056c68b597 100644 --- a/src/detect-tag.c +++ b/src/detect-tag.c @@ -42,7 +42,6 @@ #include "stream-tcp-private.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" #include "threads.h" diff --git a/src/detect-target.c b/src/detect-target.c index b34b6e0d70..3357770499 100644 --- a/src/detect-target.c +++ b/src/detect-target.c @@ -24,7 +24,6 @@ */ #include "suricata-common.h" -#include "util-unittest.h" #include "detect-parse.h" #include "detect-engine.h" diff --git a/src/detect-tcp-ack.c b/src/detect-tcp-ack.c index e3e629a9e9..bf1494cdc3 100644 --- a/src/detect-tcp-ack.c +++ b/src/detect-tcp-ack.c @@ -39,7 +39,6 @@ #include "detect-tcp-ack.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" diff --git a/src/detect-tcp-flags.c b/src/detect-tcp-flags.c index 76e34aa6f9..0fd2f3bdc2 100644 --- a/src/detect-tcp-flags.c +++ b/src/detect-tcp-flags.c @@ -38,7 +38,6 @@ #include "decode-events.h" #include "detect-tcp-flags.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" diff --git a/src/detect-tcp-seq.c b/src/detect-tcp-seq.c index b38cb97f2e..c5bb58ca8a 100644 --- a/src/detect-tcp-seq.c +++ b/src/detect-tcp-seq.c @@ -37,7 +37,6 @@ #include "detect-tcp-seq.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-debug.h" diff --git a/src/detect-tcp-session.c b/src/detect-tcp-session.c index c38691403e..25aa5bd2b9 100644 --- a/src/detect-tcp-session.c +++ b/src/detect-tcp-session.c @@ -28,7 +28,6 @@ #include "stream-tcp-private.h" #include "util-debug.h" -#include "util-unittest.h" #include "detect-tcp-session.h" @@ -236,7 +235,6 @@ void DetectTcpSessionRegister(void) } #ifdef UNITTESTS -#include "util-unittest.h" #include "util-unittest-helper.h" #include "detect-engine.h" #include "detect-flow.h" diff --git a/src/detect-tcp-window.c b/src/detect-tcp-window.c index 991de5d695..3e567ed66b 100644 --- a/src/detect-tcp-window.c +++ b/src/detect-tcp-window.c @@ -35,7 +35,6 @@ #include "flow-var.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-byte.h" diff --git a/src/detect-threshold.c b/src/detect-threshold.c index a0eba04992..7c31b2116b 100644 --- a/src/detect-threshold.c +++ b/src/detect-threshold.c @@ -51,7 +51,6 @@ #include "detect-engine-address.h" #include "detect-engine-build.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-byte.h" #include "util-debug.h" diff --git a/src/detect-tls-cert-fingerprint.c b/src/detect-tls-cert-fingerprint.c index ce3c738105..f3a519576a 100644 --- a/src/detect-tls-cert-fingerprint.c +++ b/src/detect-tls-cert-fingerprint.c @@ -50,7 +50,6 @@ #include "app-layer.h" #include "app-layer-ssl.h" -#include "util-unittest.h" #include "util-unittest-helper.h" static int DetectTlsFingerprintSetup(DetectEngineCtx *, Signature *, const char *); diff --git a/src/detect-tls-cert-issuer.c b/src/detect-tls-cert-issuer.c index 4ccb4a9a67..916942b7f2 100644 --- a/src/detect-tls-cert-issuer.c +++ b/src/detect-tls-cert-issuer.c @@ -50,7 +50,6 @@ #include "app-layer-ssl.h" #include "detect-tls-cert-issuer.h" -#include "util-unittest.h" #include "util-unittest-helper.h" static int DetectTlsIssuerSetup(DetectEngineCtx *, Signature *, const char *); diff --git a/src/detect-tls-cert-serial.c b/src/detect-tls-cert-serial.c index da8839f3a3..8e2acda54d 100644 --- a/src/detect-tls-cert-serial.c +++ b/src/detect-tls-cert-serial.c @@ -50,7 +50,6 @@ #include "app-layer-ssl.h" #include "detect-tls-cert-serial.h" -#include "util-unittest.h" #include "util-unittest-helper.h" static int DetectTlsSerialSetup(DetectEngineCtx *, Signature *, const char *); diff --git a/src/detect-tls-cert-subject.c b/src/detect-tls-cert-subject.c index f14ebac981..e61c0d71a2 100644 --- a/src/detect-tls-cert-subject.c +++ b/src/detect-tls-cert-subject.c @@ -50,7 +50,6 @@ #include "app-layer.h" #include "app-layer-ssl.h" -#include "util-unittest.h" #include "util-unittest-helper.h" static int DetectTlsSubjectSetup(DetectEngineCtx *, Signature *, const char *); diff --git a/src/detect-tls-cert-validity.c b/src/detect-tls-cert-validity.c index bcf16339c7..b0ea60c26b 100644 --- a/src/detect-tls-cert-validity.c +++ b/src/detect-tls-cert-validity.c @@ -44,7 +44,6 @@ #include "app-layer.h" #include "app-layer-ssl.h" -#include "util-unittest.h" #include "util-unittest-helper.h" /** diff --git a/src/detect-tls-certs.c b/src/detect-tls-certs.c index 1c3c847be9..7b4e3d3216 100644 --- a/src/detect-tls-certs.c +++ b/src/detect-tls-certs.c @@ -53,7 +53,6 @@ #include "app-layer-ssl.h" #include "util-profiling.h" -#include "util-unittest.h" #include "util-unittest-helper.h" static int DetectTlsCertsSetup(DetectEngineCtx *, Signature *, const char *); diff --git a/src/detect-tls-ja3-hash.c b/src/detect-tls-ja3-hash.c index f554351a88..9be33f0ea6 100644 --- a/src/detect-tls-ja3-hash.c +++ b/src/detect-tls-ja3-hash.c @@ -54,7 +54,6 @@ #include "app-layer.h" #include "app-layer-ssl.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #ifndef HAVE_JA3 diff --git a/src/detect-tls-ja3-string.c b/src/detect-tls-ja3-string.c index 2c7e2605ce..533c25d7a0 100644 --- a/src/detect-tls-ja3-string.c +++ b/src/detect-tls-ja3-string.c @@ -54,7 +54,6 @@ #include "app-layer.h" #include "app-layer-ssl.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #ifndef HAVE_JA3 diff --git a/src/detect-tls-ja3s-hash.c b/src/detect-tls-ja3s-hash.c index 0914875cae..5784a6747d 100644 --- a/src/detect-tls-ja3s-hash.c +++ b/src/detect-tls-ja3s-hash.c @@ -54,7 +54,6 @@ #include "app-layer.h" #include "app-layer-ssl.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #ifndef HAVE_JA3 diff --git a/src/detect-tls-ja3s-string.c b/src/detect-tls-ja3s-string.c index d0220c2b37..e37a8096c1 100644 --- a/src/detect-tls-ja3s-string.c +++ b/src/detect-tls-ja3s-string.c @@ -54,7 +54,6 @@ #include "app-layer.h" #include "app-layer-ssl.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #ifndef HAVE_JA3 diff --git a/src/detect-tls-sni.c b/src/detect-tls-sni.c index 281ea66630..2c278958ea 100644 --- a/src/detect-tls-sni.c +++ b/src/detect-tls-sni.c @@ -50,7 +50,6 @@ #include "detect-engine-prefilter.h" #include "detect-tls-sni.h" -#include "util-unittest.h" #include "util-unittest-helper.h" static int DetectTlsSniSetup(DetectEngineCtx *, Signature *, const char *); diff --git a/src/detect-tls-version.c b/src/detect-tls-version.c index 1bd4754270..98fc025937 100644 --- a/src/detect-tls-version.c +++ b/src/detect-tls-version.c @@ -39,7 +39,6 @@ #include "flow-util.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "app-layer.h" diff --git a/src/detect-tls.c b/src/detect-tls.c index 4e44535336..5dfa535093 100644 --- a/src/detect-tls.c +++ b/src/detect-tls.c @@ -51,7 +51,6 @@ #include "flow-util.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "app-layer.h" diff --git a/src/detect-tos.c b/src/detect-tos.c index ff920be6d9..0653c8d56d 100644 --- a/src/detect-tos.c +++ b/src/detect-tos.c @@ -40,7 +40,6 @@ #include "util-byte.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #define PARSE_REGEX "^\\s*(!?\\s*[0-9]{1,3}|!?\\s*[xX][0-9a-fA-F]{1,2})\\s*$" diff --git a/src/detect-uricontent.c b/src/detect-uricontent.c index e9a5a86560..ae0b17e8c6 100644 --- a/src/detect-uricontent.c +++ b/src/detect-uricontent.c @@ -50,7 +50,6 @@ #include "util-mpm.h" #include "util-print.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-spm.h" #include "conf.h" diff --git a/src/detect-urilen.c b/src/detect-urilen.c index 79bc46f562..21b9a99ec6 100644 --- a/src/detect-urilen.c +++ b/src/detect-urilen.c @@ -27,7 +27,6 @@ #include "app-layer.h" #include "app-layer-protos.h" #include "app-layer-htp.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "detect.h" diff --git a/src/detect-within.c b/src/detect-within.c index 08b8e39cc2..31f2364d1c 100644 --- a/src/detect-within.c +++ b/src/detect-within.c @@ -42,7 +42,6 @@ #include "util-debug.h" #include "detect-pcre.h" #include "detect-within.h" -#include "util-unittest.h" static int DetectWithinSetup(DetectEngineCtx *, Signature *, const char *); #ifdef UNITTESTS diff --git a/src/detect-xbits.c b/src/detect-xbits.c index 6b2211bac7..b0a869b734 100644 --- a/src/detect-xbits.c +++ b/src/detect-xbits.c @@ -51,7 +51,6 @@ #include "tx-bit.h" #include "util-var-name.h" -#include "util-unittest.h" #include "util-debug.h" /* diff --git a/src/device-storage.c b/src/device-storage.c index 2ea6311408..50c764f0a8 100644 --- a/src/device-storage.c +++ b/src/device-storage.c @@ -27,7 +27,6 @@ #include "device-storage.h" #include "util-device-private.h" #include "util-storage.h" -#include "util-unittest.h" unsigned int SCLiveDevStorageSize(void) { diff --git a/src/flow-bit.c b/src/flow-bit.c index 43894ae905..801541eeb7 100644 --- a/src/flow-bit.c +++ b/src/flow-bit.c @@ -40,7 +40,6 @@ #include "detect.h" #include "util-var.h" #include "util-debug.h" -#include "util-unittest.h" /* get the flowbit with idx from the flow */ static FlowBit *FlowBitGet(Flow *f, uint32_t idx) diff --git a/src/flow-storage.c b/src/flow-storage.c index 3c0dc05f13..7b0c014268 100644 --- a/src/flow-storage.c +++ b/src/flow-storage.c @@ -28,7 +28,6 @@ #include "suricata-common.h" #include "flow-storage.h" #include "util-storage.h" -#include "util-unittest.h" unsigned int SCFlowStorageSize(void) { diff --git a/src/flow-timeout.c b/src/flow-timeout.c index ba1829ea34..04e5a0a2fc 100644 --- a/src/flow-timeout.c +++ b/src/flow-timeout.c @@ -46,7 +46,6 @@ #include "stream-tcp-reassemble.h" #include "stream-tcp.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-byte.h" diff --git a/src/flow.c b/src/flow.c index 4454258871..d58b3d9b6d 100644 --- a/src/flow.c +++ b/src/flow.c @@ -47,7 +47,6 @@ #include "stream-tcp-private.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-byte.h" #include "util-misc.h" diff --git a/src/host-bit.c b/src/host-bit.c index 9b4f483498..aa23757dc1 100644 --- a/src/host-bit.c +++ b/src/host-bit.c @@ -35,7 +35,6 @@ #include "detect.h" #include "util-var.h" #include "util-debug.h" -#include "util-unittest.h" #include "host-storage.h" static SCHostStorageId host_bit_id = { .id = -1 }; /**< Host storage id for bits */ diff --git a/src/host-storage.c b/src/host-storage.c index cf602e165c..ea832fa5e4 100644 --- a/src/host-storage.c +++ b/src/host-storage.c @@ -25,7 +25,6 @@ #include "suricata-common.h" #include "host-storage.h" -#include "util-unittest.h" unsigned int SCHostStorageSize(void) { diff --git a/src/ippair-bit.c b/src/ippair-bit.c index 2d28d21482..08df1b6494 100644 --- a/src/ippair-bit.c +++ b/src/ippair-bit.c @@ -35,7 +35,6 @@ #include "detect.h" #include "util-var.h" #include "util-debug.h" -#include "util-unittest.h" #include "ippair-storage.h" static SCIPPairStorageId g_ippair_bit_storage_id = { .id = -1 }; /**< IPPair storage id for bits */ diff --git a/src/ippair-storage.c b/src/ippair-storage.c index f096121b1f..5b28f6851f 100644 --- a/src/ippair-storage.c +++ b/src/ippair-storage.c @@ -25,7 +25,6 @@ #include "suricata-common.h" #include "ippair-storage.h" -#include "util-unittest.h" unsigned int SCIPPairStorageSize(void) { diff --git a/src/log-stats.c b/src/log-stats.c index a3cc7a0bfc..ceeacc33bb 100644 --- a/src/log-stats.c +++ b/src/log-stats.c @@ -32,7 +32,6 @@ #include "tm-threads.h" #include "util-print.h" -#include "util-unittest.h" #include "util-debug.h" diff --git a/src/output-eve-stream.c b/src/output-eve-stream.c index 9e6d0107ed..7bad358fb4 100644 --- a/src/output-eve-stream.c +++ b/src/output-eve-stream.c @@ -43,7 +43,6 @@ #include "stream-tcp.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-classification-config.h" #include "util-privs.h" diff --git a/src/output-json-dhcp.c b/src/output-json-dhcp.c index 684742765e..476da65bc3 100644 --- a/src/output-json-dhcp.c +++ b/src/output-json-dhcp.c @@ -30,7 +30,6 @@ #include "threadvars.h" #include "tm-threads.h" -#include "util-unittest.h" #include "util-buffer.h" #include "util-debug.h" #include "util-byte.h" diff --git a/src/output-json-dnp3.c b/src/output-json-dnp3.c index c8bcafbb79..81f49df36c 100644 --- a/src/output-json-dnp3.c +++ b/src/output-json-dnp3.c @@ -25,7 +25,6 @@ #include "tm-threads.h" #include "util-print.h" -#include "util-unittest.h" #include "util-buffer.h" #include "util-debug.h" diff --git a/src/output-json-drop.c b/src/output-json-drop.c index 3b477220d0..c935b8587d 100644 --- a/src/output-json-drop.c +++ b/src/output-json-drop.c @@ -46,7 +46,6 @@ #include "output-json-alert.h" #include "output-json-drop.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-classification-config.h" #include "util-privs.h" diff --git a/src/output-json-email-common.c b/src/output-json-email-common.c index 149264a5f6..b989743742 100644 --- a/src/output-json-email-common.c +++ b/src/output-json-email-common.c @@ -35,7 +35,6 @@ #include "tm-threads.h" #include "util-print.h" -#include "util-unittest.h" #include "util-debug.h" #include "app-layer-parser.h" diff --git a/src/output-json-file.c b/src/output-json-file.c index 7d906bf942..ee3fffe85f 100644 --- a/src/output-json-file.c +++ b/src/output-json-file.c @@ -41,7 +41,6 @@ #include "stream.h" #include "util-print.h" -#include "util-unittest.h" #include "util-privs.h" #include "util-debug.h" #include "util-file.h" diff --git a/src/output-json-flow.c b/src/output-json-flow.c index 1d1bebdb3a..af3bfe92d7 100644 --- a/src/output-json-flow.c +++ b/src/output-json-flow.c @@ -34,7 +34,6 @@ #include "tm-threads.h" #include "util-print.h" -#include "util-unittest.h" #include "util-debug.h" diff --git a/src/output-json-frame.c b/src/output-json-frame.c index bb0909138c..ba566ed569 100644 --- a/src/output-json-frame.c +++ b/src/output-json-frame.c @@ -36,7 +36,6 @@ #include "util-logopenfile.h" #include "util-misc.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "detect-parse.h" diff --git a/src/output-json-ftp.c b/src/output-json-ftp.c index 07719d2885..ce090353c2 100644 --- a/src/output-json-ftp.c +++ b/src/output-json-ftp.c @@ -32,7 +32,6 @@ #include "threadvars.h" #include "tm-threads.h" -#include "util-unittest.h" #include "util-buffer.h" #include "util-debug.h" diff --git a/src/output-json-http.c b/src/output-json-http.c index 5da4849945..20888902a9 100644 --- a/src/output-json-http.c +++ b/src/output-json-http.c @@ -33,7 +33,6 @@ #include "tm-threads.h" #include "util-print.h" -#include "util-unittest.h" #include "util-debug.h" diff --git a/src/output-json-ike.c b/src/output-json-ike.c index 1021fa3fd8..b01b9eaa6b 100644 --- a/src/output-json-ike.c +++ b/src/output-json-ike.c @@ -33,7 +33,6 @@ #include "threadvars.h" #include "tm-threads.h" -#include "util-unittest.h" #include "util-buffer.h" #include "util-debug.h" #include "util-byte.h" diff --git a/src/output-json-metadata.c b/src/output-json-metadata.c index 8723712497..5b2b6f9b31 100644 --- a/src/output-json-metadata.c +++ b/src/output-json-metadata.c @@ -35,7 +35,6 @@ #include "util-debug.h" #include "util-misc.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "detect-parse.h" diff --git a/src/output-json-mqtt.c b/src/output-json-mqtt.c index 29e2639b01..48bb9361dc 100644 --- a/src/output-json-mqtt.c +++ b/src/output-json-mqtt.c @@ -30,7 +30,6 @@ #include "threadvars.h" #include "tm-threads.h" -#include "util-unittest.h" #include "util-buffer.h" #include "util-debug.h" #include "util-byte.h" diff --git a/src/output-json-netflow.c b/src/output-json-netflow.c index d488b4e730..3fdfc49bd6 100644 --- a/src/output-json-netflow.c +++ b/src/output-json-netflow.c @@ -34,7 +34,6 @@ #include "tm-threads.h" #include "util-print.h" -#include "util-unittest.h" #include "util-debug.h" diff --git a/src/output-json-nfs.c b/src/output-json-nfs.c index 1d77b8e989..c95a16fa5a 100644 --- a/src/output-json-nfs.c +++ b/src/output-json-nfs.c @@ -32,7 +32,6 @@ #include "threadvars.h" #include "tm-threads.h" -#include "util-unittest.h" #include "util-buffer.h" #include "util-debug.h" #include "util-byte.h" diff --git a/src/output-json-pgsql.c b/src/output-json-pgsql.c index d66dbebbf0..41979e2316 100644 --- a/src/output-json-pgsql.c +++ b/src/output-json-pgsql.c @@ -32,7 +32,6 @@ #include "threadvars.h" #include "tm-threads.h" -#include "util-unittest.h" #include "util-buffer.h" #include "util-debug.h" #include "util-byte.h" diff --git a/src/output-json-smtp.c b/src/output-json-smtp.c index 7c7dfca5e2..f78854e147 100644 --- a/src/output-json-smtp.c +++ b/src/output-json-smtp.c @@ -33,7 +33,6 @@ #include "tm-threads.h" #include "util-print.h" -#include "util-unittest.h" #include "util-debug.h" diff --git a/src/output-json-stats.c b/src/output-json-stats.c index 53ff80cd18..3e38d1dc13 100644 --- a/src/output-json-stats.c +++ b/src/output-json-stats.c @@ -34,7 +34,6 @@ #include "tm-threads.h" #include "util-print.h" -#include "util-unittest.h" #include "util-validate.h" #include "util-debug.h" diff --git a/src/output-json.c b/src/output-json.c index fab3821584..a8c8c30a06 100644 --- a/src/output-json.c +++ b/src/output-json.c @@ -32,7 +32,6 @@ #include "util-var-name.h" #include "util-macset.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "detect-engine.h" diff --git a/src/reputation.c b/src/reputation.c index f3e049d4b2..746ca4c0f7 100644 --- a/src/reputation.c +++ b/src/reputation.c @@ -37,7 +37,6 @@ #include "util-ip.h" #include "util-path.h" #include "util-print.h" -#include "util-unittest.h" #include "util-validate.h" #include "util-radix4-tree.h" #include "util-radix6-tree.h" diff --git a/src/runmode-unittests.c b/src/runmode-unittests.c index d216f95679..0fbb35f25b 100644 --- a/src/runmode-unittests.c +++ b/src/runmode-unittests.c @@ -22,7 +22,6 @@ #include "suricata-common.h" #include "runmode-unittests.h" -#include "util-unittest.h" #include "util-debug.h" #ifdef UNITTESTS diff --git a/src/runmodes.c b/src/runmodes.c index fc8b3f6886..6a004a33f5 100644 --- a/src/runmodes.c +++ b/src/runmodes.c @@ -44,7 +44,6 @@ #include "runmode-pcap-file.h" #include "runmode-unix-socket.h" #include "runmode-windivert.h" -#include "util-unittest.h" #include "util-misc.h" #include "util-plugin.h" diff --git a/src/source-windivert.c b/src/source-windivert.c index 66bfaf46ee..d216472c5b 100644 --- a/src/source-windivert.c +++ b/src/source-windivert.c @@ -35,7 +35,6 @@ #include "util-error.h" #include "util-ioctl.h" #include "util-privs.h" -#include "util-unittest.h" #include "runmodes.h" diff --git a/src/stream-tcp-inline.c b/src/stream-tcp-inline.c index d6a34a469f..850174035f 100644 --- a/src/stream-tcp-inline.c +++ b/src/stream-tcp-inline.c @@ -32,7 +32,6 @@ #include "util-print.h" #include "util-validate.h" -#include "util-unittest.h" #include "util-unittest-helper.h" /** diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c index 96de97ba53..0c996170c6 100644 --- a/src/stream-tcp-reassemble.c +++ b/src/stream-tcp-reassemble.c @@ -41,7 +41,6 @@ #include "tm-threads.h" #include "util-pool.h" -#include "util-unittest.h" #include "util-print.h" #include "util-host-os-info.h" #include "util-unittest-helper.h" diff --git a/src/stream-tcp-sack.c b/src/stream-tcp-sack.c index a1361a14bd..919e11f5f1 100644 --- a/src/stream-tcp-sack.c +++ b/src/stream-tcp-sack.c @@ -27,7 +27,6 @@ #include "stream-tcp.h" #include "stream-tcp-private.h" #include "stream-tcp-sack.h" -#include "util-unittest.h" RB_GENERATE(TCPSACK, StreamTcpSackRecord, rb, TcpSackCompare); diff --git a/src/stream-tcp-util.c b/src/stream-tcp-util.c index 9c40c77af5..f8e5f8723f 100644 --- a/src/stream-tcp-util.c +++ b/src/stream-tcp-util.c @@ -33,7 +33,6 @@ #include "util-memcmp.h" #include "util-print.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "ippair.h" diff --git a/src/stream-tcp.c b/src/stream-tcp.c index c5dd250711..c7ccea7b35 100644 --- a/src/stream-tcp.c +++ b/src/stream-tcp.c @@ -45,7 +45,6 @@ #include "util-pool.h" #include "util-pool-thread.h" #include "util-checksum.h" -#include "util-unittest.h" #include "util-print.h" #include "util-debug.h" #include "util-device-private.h" diff --git a/src/suricata-common.h b/src/suricata-common.h index 5dbfda1150..60ef9ef749 100644 --- a/src/suricata-common.h +++ b/src/suricata-common.h @@ -531,7 +531,9 @@ typedef struct lua_State lua_State; #include "util-time.h" #include "util-mem.h" #include "util-atomic.h" +#ifdef UNITTESTS #include "util-unittest.h" +#endif #ifndef HAVE_STRLCAT size_t strlcat(char *, const char *src, size_t siz); diff --git a/src/thread-storage.c b/src/thread-storage.c index edd498f72c..b646a64251 100644 --- a/src/thread-storage.c +++ b/src/thread-storage.c @@ -18,7 +18,6 @@ #include "suricata-common.h" #include "thread-storage.h" #include "util-storage.h" -#include "util-unittest.h" const StorageEnum storage_type = STORAGE_THREAD; diff --git a/src/threads.c b/src/threads.c index 8bb9ce78f1..511d427884 100644 --- a/src/threads.c +++ b/src/threads.c @@ -26,7 +26,6 @@ #include "suricata-common.h" #include "thread-storage.h" -#include "util-unittest.h" #include "util-debug.h" #include "threads.h" diff --git a/src/tmqh-flow.c b/src/tmqh-flow.c index 665b1feffa..e6551219a1 100644 --- a/src/tmqh-flow.c +++ b/src/tmqh-flow.c @@ -38,7 +38,6 @@ #include "tm-queuehandlers.h" #include "conf.h" -#include "util-unittest.h" Packet *TmqhInputFlow(ThreadVars *t); void TmqhOutputFlowHash(ThreadVars *t, Packet *p); diff --git a/src/util-action.c b/src/util-action.c index da7d9d1c45..30578e4617 100644 --- a/src/util-action.c +++ b/src/util-action.c @@ -31,7 +31,6 @@ #include "detect-engine.h" #include "detect-engine-sigorder.h" -#include "util-unittest.h" #include "util-action.h" #include "util-unittest-helper.h" #include "util-debug.h" diff --git a/src/util-affinity.c b/src/util-affinity.c index 48e2b1a76c..a4b93567d4 100644 --- a/src/util-affinity.c +++ b/src/util-affinity.c @@ -33,7 +33,6 @@ #include "util-byte.h" #include "util-debug.h" #include "util-dpdk.h" -#include "util-unittest.h" ThreadsAffinityType thread_affinity[MAX_CPU_SET] = { { diff --git a/src/util-atomic.c b/src/util-atomic.c index f5aa4a2979..98237b558f 100644 --- a/src/util-atomic.c +++ b/src/util-atomic.c @@ -24,7 +24,6 @@ #include "suricata-common.h" #include "suricata.h" #include "util-atomic.h" -#include "util-unittest.h" #ifdef UNITTESTS diff --git a/src/util-byte.c b/src/util-byte.c index 6ccaf2928f..6190f0858e 100644 --- a/src/util-byte.c +++ b/src/util-byte.c @@ -25,7 +25,6 @@ #include "suricata-common.h" #include "util-byte.h" -#include "util-unittest.h" #include "util-debug.h" #include "util-validate.h" diff --git a/src/util-cidr.c b/src/util-cidr.c index 4e6e18d67a..a2fbbc3107 100644 --- a/src/util-cidr.c +++ b/src/util-cidr.c @@ -26,7 +26,6 @@ #include "suricata-common.h" #include "util-cidr.h" #include "util-debug.h" -#include "util-unittest.h" /** \brief Turn 32 bit mask into CIDR * diff --git a/src/util-classification-config.c b/src/util-classification-config.c index 9bf9b880a4..b90f0c085a 100644 --- a/src/util-classification-config.c +++ b/src/util-classification-config.c @@ -30,7 +30,6 @@ #include "conf.h" #include "util-classification-config.h" -#include "util-unittest.h" #include "util-error.h" #include "util-debug.h" #include "util-fmemopen.h" diff --git a/src/util-file.c b/src/util-file.c index 09b554c23e..b8fcb566aa 100644 --- a/src/util-file.c +++ b/src/util-file.c @@ -1194,7 +1194,6 @@ static void FileEndSha256(File *ff) } #ifdef UNITTESTS -#include "util-unittest.h" /** * \test the inspect window guard must not wrap around diff --git a/src/util-flow-rate.c b/src/util-flow-rate.c index 06544c4a71..d955010187 100644 --- a/src/util-flow-rate.c +++ b/src/util-flow-rate.c @@ -31,7 +31,6 @@ #include "util-misc.h" #include "util-byte.h" #include "util-flow-rate.h" -#include "util-unittest.h" #include "util-unittest-helper.h" SCFlowStorageId g_flowrate_storage_id = { .id = -1 }; diff --git a/src/util-hash.c b/src/util-hash.c index e4cd341e29..39061340a7 100644 --- a/src/util-hash.c +++ b/src/util-hash.c @@ -28,7 +28,6 @@ #include "suricata-common.h" #include "util-hash.h" -#include "util-unittest.h" #include "util-memcmp.h" #include "util-debug.h" diff --git a/src/util-hashlist.c b/src/util-hashlist.c index 085a988afe..3d0fdb1da9 100644 --- a/src/util-hashlist.c +++ b/src/util-hashlist.c @@ -28,7 +28,6 @@ #include "suricata-common.h" #include "util-hashlist.h" -#include "util-unittest.h" #include "util-debug.h" #include "util-memcmp.h" diff --git a/src/util-host-os-info.c b/src/util-host-os-info.c index 0125c5e668..005cfd448b 100644 --- a/src/util-host-os-info.c +++ b/src/util-host-os-info.c @@ -38,7 +38,6 @@ #include "conf-yaml-loader.h" #include "util-enum.h" -#include "util-unittest.h" /** Enum map for the various OS flavours */ SCEnumCharMap sc_hinfo_os_policy_map[ ] = { diff --git a/src/util-lua-tls.c b/src/util-lua-tls.c index f996a83836..e657c4d0b0 100644 --- a/src/util-lua-tls.c +++ b/src/util-lua-tls.c @@ -33,7 +33,6 @@ #include "tm-threads.h" #include "util-print.h" -#include "util-unittest.h" #include "util-debug.h" diff --git a/src/util-lua.c b/src/util-lua.c index 3aee90c273..d415bba404 100644 --- a/src/util-lua.c +++ b/src/util-lua.c @@ -33,7 +33,6 @@ #include "tm-threads.h" #include "util-print.h" -#include "util-unittest.h" #include "util-debug.h" diff --git a/src/util-macset.c b/src/util-macset.c index 31e4c8a905..f4375fcf91 100644 --- a/src/util-macset.c +++ b/src/util-macset.c @@ -31,7 +31,6 @@ #include "flow-private.h" #include "flow-storage.h" #include "util-macset.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "conf.h" diff --git a/src/util-magic.c b/src/util-magic.c index 481dccd504..f154cd9aa5 100644 --- a/src/util-magic.c +++ b/src/util-magic.c @@ -29,7 +29,6 @@ #include "suricata-common.h" #include "conf.h" -#include "util-unittest.h" #include "util-magic.h" #include "util-debug.h" diff --git a/src/util-memcmp.c b/src/util-memcmp.c index 40f4fd67d6..2fd62ce43a 100644 --- a/src/util-memcmp.c +++ b/src/util-memcmp.c @@ -25,7 +25,6 @@ #include "suricata-common.h" #include "util-memcmp.h" -#include "util-unittest.h" /* code is implemented in util-memcmp.h as it's all inlined */ diff --git a/src/util-misc.c b/src/util-misc.c index 9ee69b794e..60746d7137 100644 --- a/src/util-misc.c +++ b/src/util-misc.c @@ -25,7 +25,6 @@ #include "suricata.h" #include "util-byte.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-misc.h" #include "util-validate.h" diff --git a/src/util-mpm-ac-ks.c b/src/util-mpm-ac-ks.c index 16674f5444..2d5280229c 100644 --- a/src/util-mpm-ac-ks.c +++ b/src/util-mpm-ac-ks.c @@ -75,7 +75,6 @@ #include "conf.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-memcmp.h" #include "util-memcpy.h" diff --git a/src/util-mpm-ac.c b/src/util-mpm-ac.c index 64081db757..5617eecbd5 100644 --- a/src/util-mpm-ac.c +++ b/src/util-mpm-ac.c @@ -55,7 +55,6 @@ #include "conf.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-memcmp.h" #include "util-mpm-ac.h" diff --git a/src/util-mpm-hs.c b/src/util-mpm-hs.c index a8b1e2d0ac..7697c01eb3 100644 --- a/src/util-mpm-hs.c +++ b/src/util-mpm-hs.c @@ -35,7 +35,6 @@ #include "conf.h" #include "util-conf.h" #include "util-debug.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-memcmp.h" #include "util-mpm-hs.h" diff --git a/src/util-mpm.c b/src/util-mpm.c index bfdb469437..eaff46dd2b 100644 --- a/src/util-mpm.c +++ b/src/util-mpm.c @@ -38,7 +38,6 @@ #include "conf.h" #include "conf-yaml-loader.h" #include "queue.h" -#include "util-unittest.h" #include "util-memcpy.h" #ifdef BUILD_HYPERSCAN #include "hs.h" diff --git a/src/util-pool-thread.c b/src/util-pool-thread.c index 50f39d2eac..b00a999248 100644 --- a/src/util-pool-thread.c +++ b/src/util-pool-thread.c @@ -32,7 +32,6 @@ #include "suricata-common.h" #include "util-pool.h" #include "util-pool-thread.h" -#include "util-unittest.h" #include "util-debug.h" #include "util-validate.h" diff --git a/src/util-pool.c b/src/util-pool.c index 4578704b93..51591765fc 100644 --- a/src/util-pool.c +++ b/src/util-pool.c @@ -41,7 +41,6 @@ #include "suricata-common.h" #include "util-pool.h" #include "util-pool-thread.h" -#include "util-unittest.h" #include "util-debug.h" #include "util-validate.h" diff --git a/src/util-profiling.c b/src/util-profiling.c index b6ec465495..45d917fbda 100644 --- a/src/util-profiling.c +++ b/src/util-profiling.c @@ -32,7 +32,6 @@ #ifdef PROFILING #include "tm-threads.h" #include "conf.h" -#include "util-unittest.h" #include "util-byte.h" #include "util-profiling-locks.h" #include "util-conf.h" diff --git a/src/util-proto-name.c b/src/util-proto-name.c index 0a7e88a53c..15aa48d14b 100644 --- a/src/util-proto-name.c +++ b/src/util-proto-name.c @@ -30,7 +30,6 @@ #include "util-debug.h" #ifdef UNITTESTS -#include "util-unittest.h" #endif /** Lookup array to hold the information related to known protocol diff --git a/src/util-radix4-tree.c b/src/util-radix4-tree.c index 7c7a448d5b..3eb204be2a 100644 --- a/src/util-radix4-tree.c +++ b/src/util-radix4-tree.c @@ -28,7 +28,6 @@ #include "util-debug.h" #include "util-error.h" #include "util-ip.h" -#include "util-unittest.h" #include "util-memcmp.h" #include "util-print.h" #include "util-byte.h" diff --git a/src/util-radix6-tree.c b/src/util-radix6-tree.c index 659315d857..1dfe0b85cf 100644 --- a/src/util-radix6-tree.c +++ b/src/util-radix6-tree.c @@ -29,7 +29,6 @@ #include "util-error.h" #include "util-ip.h" #include "util-cidr.h" -#include "util-unittest.h" #include "util-memcmp.h" #include "util-print.h" #include "util-byte.h" diff --git a/src/util-reference-config.c b/src/util-reference-config.c index f4a2a9f6c0..d962e01944 100644 --- a/src/util-reference-config.c +++ b/src/util-reference-config.c @@ -28,7 +28,6 @@ #include "util-reference-config.h" #include "conf.h" -#include "util-unittest.h" #include "util-debug.h" #include "util-fmemopen.h" diff --git a/src/util-rohash.c b/src/util-rohash.c index b74deefa11..9bc7cfdc02 100644 --- a/src/util-rohash.c +++ b/src/util-rohash.c @@ -36,7 +36,6 @@ #include "suricata-common.h" #include "util-hash.h" -#include "util-unittest.h" #include "util-memcmp.h" #include "util-hash-lookup3.h" #include "util-rohash.h" diff --git a/src/util-rule-vars.c b/src/util-rule-vars.c index 6e5f2147c3..49e50ea58e 100644 --- a/src/util-rule-vars.c +++ b/src/util-rule-vars.c @@ -36,7 +36,6 @@ #include "util-rule-vars.h" #include "util-enum.h" #include "util-debug.h" -#include "util-unittest.h" /** An enum-string map, that maps the different vars type in the yaml conf * type with the mapping path in the yaml conf file */ diff --git a/src/util-running-modes.c b/src/util-running-modes.c index 5aaf6bf09d..b191278447 100644 --- a/src/util-running-modes.c +++ b/src/util-running-modes.c @@ -26,7 +26,6 @@ #include "app-layer-parser.h" #include "detect-engine.h" #include "detect-parse.h" -#include "util-unittest.h" #include "util-debug.h" #include "conf-yaml-loader.h" #include "util-running-modes.h" diff --git a/src/util-spm.c b/src/util-spm.c index 2f7dbc46c8..2589f18bbd 100644 --- a/src/util-spm.c +++ b/src/util-spm.c @@ -44,7 +44,6 @@ */ #include "suricata-common.h" -#include "util-unittest.h" #include "conf.h" diff --git a/src/util-storage.c b/src/util-storage.c index b425a3b91e..6adb188b8d 100644 --- a/src/util-storage.c +++ b/src/util-storage.c @@ -24,7 +24,6 @@ */ #include "suricata-common.h" -#include "util-unittest.h" #include "util-storage.h" #include "util-debug.h" diff --git a/src/util-streaming-buffer.c b/src/util-streaming-buffer.c index 8c96c67818..bc7639e70c 100644 --- a/src/util-streaming-buffer.c +++ b/src/util-streaming-buffer.c @@ -17,7 +17,6 @@ #include "suricata-common.h" #include "util-streaming-buffer.h" -#include "util-unittest.h" #include "util-print.h" #include "util-validate.h" #include "util-debug.h" diff --git a/src/util-threshold-config.c b/src/util-threshold-config.c index 7693ef30bb..b26c51ee10 100644 --- a/src/util-threshold-config.c +++ b/src/util-threshold-config.c @@ -44,7 +44,6 @@ #include "conf.h" #include "util-threshold-config.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #include "util-byte.h" #include "util-debug.h" diff --git a/src/util-time.c b/src/util-time.c index 2e68ec8c92..868d8ff50a 100644 --- a/src/util-time.c +++ b/src/util-time.c @@ -65,7 +65,6 @@ #include "tm-threads.h" #include "util-debug.h" #include "util-time.h" -#include "util-unittest.h" #ifdef UNITTESTS static struct timeval current_time = { 0, 0 }; diff --git a/src/util-unittest-helper.c b/src/util-unittest-helper.c index 45b3144fb3..38c68c38b3 100644 --- a/src/util-unittest-helper.c +++ b/src/util-unittest-helper.c @@ -44,7 +44,6 @@ #include "util-debug.h" #include "util-error.h" -#include "util-unittest.h" #include "util-unittest-helper.h" #if defined(UNITTESTS) || defined(FUZZ) diff --git a/src/util-unittest.c b/src/util-unittest.c index bb79665748..c0844784d6 100644 --- a/src/util-unittest.c +++ b/src/util-unittest.c @@ -34,7 +34,6 @@ #include "suricata-common.h" #include "runmodes.h" -#include "util-unittest.h" #include "util-debug.h" #include "conf.h" diff --git a/src/win32-syscall.c b/src/win32-syscall.c index 7e6e70f429..4714be830d 100644 --- a/src/win32-syscall.c +++ b/src/win32-syscall.c @@ -54,7 +54,6 @@ #include "suricata-common.h" #include "util-debug.h" #include "util-device-private.h" -#include "util-unittest.h" #include "suricata.h"