Skip to content

Commit c45152a

Browse files
committed
making conditional on machine
1 parent 01caaa2 commit c45152a

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

projects/pcapplusplus/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#
1717
################################################################################
1818

19+
# TODO: Right now, we apply patch only if sanitizer is not 'memory'.
1920
# TODO: Upstream the patch to PcapPlusPlus repo.
2021
git -C "$SRC/PcapPlusPlus" apply "$SRC/pcapplusplus_enable_tests.diff"
2122
$SRC/PcapPlusPlus/Tests/Fuzzers/ossfuzz.sh

projects/pcapplusplus/pcapplusplus_enable_tests.diff

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
diff --git a/Tests/Fuzzers/ossfuzz.sh b/Tests/Fuzzers/ossfuzz.sh
2-
index 6d461ff6..b4c26535 100755
1+
index 6d461ff6..c984c978 100755
32
--- a/Tests/Fuzzers/ossfuzz.sh
43
+++ b/Tests/Fuzzers/ossfuzz.sh
5-
@@ -12,7 +12,7 @@ make -j$(nproc)
4+
@@ -12,7 +12,13 @@ make -j$(nproc)
65
# Build PcapPlusPlus linking statically against the built libpcap
76
cd $SRC/PcapPlusPlus
87
LIBPCAP_PATH=$SRC/libpcap/
98
-cmake -DPCAPPP_BUILD_FUZZERS=ON -DPCAPPP_BUILD_TESTS=OFF -DPCAPPP_BUILD_EXAMPLES=OFF -DPCAP_INCLUDE_DIR="${LIBPCAP_PATH}/" -DPCAP_LIBRARY="${LIBPCAP_PATH}/libpcap.a" -S . -B $TARGETS_DIR
10-
+cmake -DPCAPPP_BUILD_FUZZERS=ON -DPCAPPP_BUILD_TESTS=ON -DPCAPPP_BUILD_EXAMPLES=OFF -DPCAP_INCLUDE_DIR="${LIBPCAP_PATH}/" -DPCAP_LIBRARY="${LIBPCAP_PATH}/libpcap.a" -S . -B $TARGETS_DIR
9+
+
10+
+PCAPPP_BUILD_TESTS_VALUE="ON"
11+
+if [ "${SANITIZER:-}" = "memory" ]; then
12+
+ PCAPPP_BUILD_TESTS_VALUE="OFF"
13+
+fi
14+
+
15+
+cmake -DPCAPPP_BUILD_FUZZERS=ON -DPCAPPP_BUILD_TESTS=$PCAPPP_BUILD_TESTS_VALUE -DPCAPPP_BUILD_EXAMPLES=OFF -DPCAP_INCLUDE_DIR="${LIBPCAP_PATH}/" -DPCAP_LIBRARY="${LIBPCAP_PATH}/libpcap.a" -S . -B $TARGETS_DIR
1116
cmake --build $TARGETS_DIR -j
1217

1318
# Copy target and options
14-

0 commit comments

Comments
 (0)