Skip to content

Commit a98805b

Browse files
tokatokatokatoka
authoredDec 20, 2023
Another attemp to fix CI (#1744)
* fixing? * more * delete macos build_and_run fuzzers as its runtime exceeds 360minutes and can't fix it
·
0.15.10.11.2
1 parent 68e7b20 commit a98805b

File tree

18 files changed

+39
-61
lines changed

18 files changed

+39
-61
lines changed
 

‎.github/workflows/build_and_test.yml

+1-23
Original file line numberDiff line numberDiff line change
@@ -191,18 +191,14 @@ jobs:
191191
fuzzers:
192192
strategy:
193193
matrix:
194-
os: [ubuntu-latest, macos-latest]
194+
os: [ubuntu-latest]
195195
runs-on: ${{ matrix.os }}
196196
steps:
197197
- uses: actions-rs/toolchain@v1
198198
with:
199199
profile: minimal
200200
toolchain: stable
201-
- name: Remove Dotnet (macOS)
202-
if: runner.os == 'macOS'
203-
run: rm -rf /usr/local/bin/dotnet
204201
- name: Free Disk Space (Ubuntu)
205-
if: runner.os == 'Linux'
206202
uses: jlumbroso/free-disk-space@main
207203
with:
208204
# this might remove tools that are actually needed,
@@ -223,31 +219,16 @@ jobs:
223219
run: rustup toolchain install nightly-x86_64-unknown-linux-gnu ; rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
224220
- name: Add wasm target
225221
run: rustup target add wasm32-unknown-unknown
226-
- name: Install cxxbridge
227-
if: runner.os == 'macOS'
228-
run: cargo install cxxbridge-cmd
229222
- name: Install ucd-generate
230223
run: cargo install -f ucd-generate
231-
- name: Install python (macOS)
232-
# Removing macOS things already installed in CI against failed linking
233-
if: runner.os == 'macOS'
234-
run: rm /usr/local/bin/2to3* /usr/local/bin/idle3* /usr/local/bin/pydoc3* /usr/local/bin/python3*; brew install --force-bottle --overwrite python
235-
- name: Remove obsolete llvm (macOS)
236-
if: runner.os == 'macOS'
237-
run: brew remove --force llvm clang
238224
- name: Remove obsolete llvm (Linux)
239-
if: runner.os == 'Linux'
240225
run: sudo apt purge llvm* clang*
241226
- uses: lyricwulf/abc@v1
242227
with:
243228
linux: llvm-15 llvm-15-dev clang-15 nasm ninja-build gcc-arm-linux-gnueabi g++-arm-linux-gnueabi gcc-aarch64-linux-gnu g++-aarch64-linux-gnu gcc-mipsel-linux-gnu g++-mipsel-linux-gnu gcc-powerpc-linux-gnu g++-powerpc-linux-gnu libc6-dev-i386-cross libc6-dev libc6-dev-i386 lib32gcc-11-dev lib32stdc++-11-dev libgtk-3-dev pax-utils libz3-dev
244-
# update bash for macos to support `declare -A` command`
245-
macos: llvm@15 libpng nasm coreutils z3 bash wget
246229
- name: Set clang version
247-
if: runner.os == 'Linux'
248230
run: sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-15 100
249231
- name: Set clang++ version
250-
if: runner.os == 'Linux'
251232
run: sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-15 100
252233
- name: pip install
253234
run: python3 -m pip install msgpack jinja2 find_libpython
@@ -278,9 +259,6 @@ jobs:
278259
- name: Build and run example fuzzers (Linux)
279260
if: runner.os == 'Linux'
280261
run: RUN_ON_CI=1 LLVM_CONFIG=llvm-config-15 ./scripts/test_all_fuzzers.sh
281-
- name: Build and run example fuzzers (macOS)
282-
if: runner.os == 'macOS' # use bash v4
283-
run: /usr/local/bin/bash -c 'RUN_ON_CI=1 ./scripts/test_all_fuzzers.sh'
284262

285263
qemu_fuzzers:
286264
strategy:

‎fuzzers/baby_fuzzer_swap_differential/Makefile.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ windows_alias = "unsupported"
3333
[tasks.test_unix]
3434
script_runner = "@shell"
3535
script='''
36-
timeout 10s ${CARGO_TARGET_DIR}/${PROFILE_DIR}/${FUZZER_NAME} >fuzz_stdout.log || true
36+
timeout 30s ${CARGO_TARGET_DIR}/${PROFILE_DIR}/${FUZZER_NAME} >fuzz_stdout.log || true
3737
if [ -z "$(grep "objectives: 1" fuzz_stdout.log)" ]; then
3838
echo "Fuzzer does not generate any testcases or any crashes"
3939
exit 1

‎fuzzers/frida_libpng/Makefile.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ windows_alias = "test_windows"
110110
script_runner = "@shell"
111111
script='''
112112
rm -rf libafl_unix_shmem_server || true
113-
timeout 10s ./${FUZZER_NAME} -F LLVMFuzzerTestOneInput -H ./libpng-harness.so -l ./libpng-harness.so >fuzz_stdout.log || true
113+
timeout 30s ./${FUZZER_NAME} -F LLVMFuzzerTestOneInput -H ./libpng-harness.so -l ./libpng-harness.so >fuzz_stdout.log 2>/dev/null || true
114114
if [ -z "$(grep "corpus: 30" fuzz_stdout.log)" ]; then
115115
echo "Fuzzer does not generate any testcases or any crashes"
116116
exit 1
@@ -125,7 +125,7 @@ dependencies = [ "fuzzer", "harness" ]
125125
script_runner = "@shell"
126126
script='''
127127
rm -rf libafl_unix_shmem_server || true
128-
timeout 10s ./${FUZZER_NAME} -F LLVMFuzzerTestOneInput -H ./libpng-harness.so -l ./libpng-harness.so >fuzz_stdout.log || true
128+
timeout 30s ./${FUZZER_NAME} -F LLVMFuzzerTestOneInput -H ./libpng-harness.so -l ./libpng-harness.so >fuzz_stdout.log 2>/dev/null || true
129129
'''
130130
dependencies = [ "fuzzer", "harness" ]
131131

‎fuzzers/fuzzbench/Makefile.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ rm -rf libafl_unix_shmem_server || true
8282
mkdir in || true
8383
echo a > in/a
8484
# Allow sigterm as exit code
85-
timeout 11s ./${FUZZER_NAME} -o out -i in >fuzz_stdout.log || true
86-
if [ -z "$(grep "objectives: 10" fuzz_stdout.log)" ]; then
85+
timeout 31s ./${FUZZER_NAME} -o out -i in >fuzz_stdout.log || true
86+
if [ -z "$(grep "objectives: 1" fuzz_stdout.log)" ]; then
8787
echo "Fuzzer does not generate any testcases or any crashes"
8888
exit 1
8989
else

‎fuzzers/fuzzbench_text/Makefile.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ rm -rf libafl_unix_shmem_server || true
8383
mkdir in || true
8484
echo a > in/a
8585
# Allow sigterm as exit code
86-
timeout 11s ./${FUZZER_NAME} -o out -i in >fuzz_stdout.log || true
86+
timeout 31s ./${FUZZER_NAME} -o out -i in >fuzz_stdout.log || true
8787
cat fuzz_stdout.log
88-
if [ -z "$(grep "objectives: 10" fuzz_stdout.log)" ]; then
88+
if [ -z "$(grep "objectives: 1" fuzz_stdout.log)" ]; then
8989
echo "Fuzzer does not generate any testcases or any crashes"
9090
exit 1
9191
else

‎fuzzers/libafl_atheris/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ short_test: all
4141
(\
4242
rm -rf libafl_unix_shmem_server || true; \
4343
. env/bin/activate; \
44-
LD_PRELOAD=$(DEEXIT_PATH) DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES=$(DEEXIT_PATH) RUST_BACKTRACE=1 timeout 10s python3 ./atheris/example_fuzzers/fuzzing_example.py --cores 0 -i in -o out || true; \
44+
LD_PRELOAD=$(DEEXIT_PATH) DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES=$(DEEXIT_PATH) RUST_BACKTRACE=1 timeout 30s python3 ./atheris/example_fuzzers/fuzzing_example.py --cores 0 -i in -o out || true; \
4545
rm -rf out; \
4646
)
4747

‎fuzzers/libfuzzer_libmozjpeg/Makefile.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ windows_alias = "unsupported"
9999
script_runner = "@shell"
100100
script='''
101101
rm -rf libafl_unix_shmem_server || true
102-
(timeout 11s ./${FUZZER_NAME} >fuzz_stdout.log 2>/dev/null || true) &
102+
(timeout 31s ./${FUZZER_NAME} >fuzz_stdout.log 2>/dev/null || true) &
103103
sleep 0.2
104-
timeout 10s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true
104+
timeout 30s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true
105105
if [ -z "$(grep "corpus: 30" fuzz_stdout.log)" ]; then
106106
echo "Fuzzer does not generate any testcases or any crashes"
107107
exit 1

‎fuzzers/libfuzzer_libpng/Makefile.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ windows_alias = "unsupported"
161161
script_runner = "@shell"
162162
script='''
163163
rm -rf libafl_unix_shmem_server || true
164-
(timeout 11s ./${FUZZER_NAME} >fuzz_stdout.log 2>/dev/null || true) &
164+
(timeout 31s ./${FUZZER_NAME} >fuzz_stdout.log 2>/dev/null || true) &
165165
sleep 0.2
166-
timeout 10s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true
166+
timeout 30s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true
167167
if [ -z "$(grep "corpus: 30" fuzz_stdout.log)" ]; then
168168
echo "Fuzzer does not generate any testcases or any crashes"
169169
exit 1
@@ -177,9 +177,9 @@ dependencies = [ "fuzzer" ]
177177
script_runner = "@shell"
178178
script='''
179179
rm -rf libafl_unix_shmem_server || true
180-
(timeout 11s ./${FUZZER_NAME} >fuzz_stdout.log 2>/dev/null || true) &
180+
(timeout 31s ./${FUZZER_NAME} >fuzz_stdout.log 2>/dev/null || true) &
181181
sleep 0.2
182-
timeout 10s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true
182+
timeout 30s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true
183183
'''
184184
dependencies = [ "fuzzer" ]
185185

‎fuzzers/libfuzzer_libpng_accounting/Makefile.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ windows_alias = "unsupported"
9898
script_runner = "@shell"
9999
script='''
100100
rm -rf libafl_unix_shmem_server || true
101-
timeout 11s ./${FUZZER_NAME} --cores 0 --input ./corpus >fuzz_stdout.log 2>/dev/null || true
101+
timeout 31s ./${FUZZER_NAME} --cores 0 --input ./corpus >fuzz_stdout.log 2>/dev/null || true
102102
if [ -z "$(grep "corpus: 30" fuzz_stdout.log)" ]; then
103103
echo "Fuzzer does not generate any testcases or any crashes"
104104
exit 1
@@ -112,7 +112,7 @@ dependencies = [ "fuzzer" ]
112112
script_runner = "@shell"
113113
script='''
114114
rm -rf libafl_unix_shmem_server || true
115-
timeout 11s ./${FUZZER_NAME} --cores 0 --input ./corpus >fuzz_stdout.log 2>/dev/null || true
115+
timeout 31s ./${FUZZER_NAME} --cores 0 --input ./corpus >fuzz_stdout.log 2>/dev/null || true
116116
'''
117117
dependencies = [ "fuzzer" ]
118118

‎fuzzers/libfuzzer_libpng_centralized/Makefile.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ windows_alias = "unsupported"
9898
script_runner = "@shell"
9999
script='''
100100
rm -rf libafl_unix_shmem_server || true
101-
timeout 11s ./${FUZZER_NAME} --cores 0 --input ./corpus 2>/dev/null >fuzz_stdout.log || true
101+
timeout 31s ./${FUZZER_NAME} --cores 0 --input ./corpus 2>/dev/null >fuzz_stdout.log || true
102102
if [ -z "$(grep "corpus: 30" fuzz_stdout.log)" ]; then
103103
echo "Fuzzer does not generate any testcases or any crashes"
104104
exit 1
@@ -112,7 +112,7 @@ dependencies = [ "fuzzer" ]
112112
script_runner = "@shell"
113113
script='''
114114
rm -rf libafl_unix_shmem_server || true
115-
timeout 11s ./${FUZZER_NAME} --cores 0 --input ./corpus 2>/dev/null >fuzz_stdout.log || true
115+
timeout 31s ./${FUZZER_NAME} --cores 0 --input ./corpus 2>/dev/null >fuzz_stdout.log || true
116116
'''
117117
dependencies = [ "fuzzer" ]
118118

‎fuzzers/libfuzzer_libpng_cmin/Makefile.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ windows_alias = "unsupported"
161161
script_runner = "@shell"
162162
script='''
163163
rm -rf libafl_unix_shmem_server || true
164-
timeout 11s ./${FUZZER_NAME} >fuzz_stdout.log &
164+
timeout 31s ./${FUZZER_NAME} >fuzz_stdout.log &
165165
sleep 0.2
166-
timeout 10s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true
166+
timeout 30s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true
167167
if [ -z "$(grep "corpus: 30" fuzz_stdout.log)" ]; then
168168
echo "Fuzzer does not generate any testcases or any crashes"
169169
exit 1
@@ -177,9 +177,9 @@ dependencies = [ "fuzzer" ]
177177
script_runner = "@shell"
178178
script='''
179179
rm -rf libafl_unix_shmem_server || true
180-
timeout 11s ./${FUZZER_NAME} >fuzz_stdout.log &
180+
timeout 31s ./${FUZZER_NAME} >fuzz_stdout.log &
181181
sleep 0.2
182-
timeout 10s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true
182+
timeout 30s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true
183183
'''
184184
dependencies = [ "fuzzer" ]
185185

‎fuzzers/libfuzzer_libpng_ctx/Makefile.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ windows_alias = "unsupported"
9898
script_runner = "@shell"
9999
script='''
100100
rm -rf libafl_unix_shmem_server || true
101-
timeout 11s ./${FUZZER_NAME} --cores 0 --input ./corpus >fuzz_stdout.log 2>/dev/null || true
101+
timeout 31s ./${FUZZER_NAME} --cores 0 --input ./corpus >fuzz_stdout.log 2>/dev/null || true
102102
if [ -z "$(grep "corpus: 30" fuzz_stdout.log)" ]; then
103103
echo "Fuzzer does not generate any testcases or any crashes"
104104
exit 1
@@ -112,7 +112,7 @@ dependencies = [ "fuzzer" ]
112112
script_runner = "@shell"
113113
script='''
114114
rm -rf libafl_unix_shmem_server || true
115-
timeout 11s ./${FUZZER_NAME} --cores 0 --input ./corpus >fuzz_stdout.log 2>/dev/null || true
115+
timeout 31s ./${FUZZER_NAME} --cores 0 --input ./corpus >fuzz_stdout.log 2>/dev/null || true
116116
'''
117117

118118
# Clean up

‎fuzzers/libfuzzer_libpng_launcher/Makefile.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ windows_alias = "unsupported"
9999
script_runner = "@shell"
100100
script='''
101101
rm -rf libafl_unix_shmem_server || true
102-
timeout 11s ./${FUZZER_NAME}.coverage --broker-port 21337 --cores 0 --input ./corpus 2>/dev/null >fuzz_stdout.log || true
102+
timeout 31s ./${FUZZER_NAME}.coverage --broker-port 21337 --cores 0 --input ./corpus 2>/dev/null >fuzz_stdout.log || true
103103
if [ -z "$(grep "corpus: 30" fuzz_stdout.log)" ]; then
104104
echo "Fuzzer does not generate any testcases or any crashes"
105105
exit 1
@@ -113,7 +113,7 @@ dependencies = [ "fuzzer" ]
113113
script_runner = "@shell"
114114
script='''
115115
rm -rf libafl_unix_shmem_server || true
116-
timeout 11s ./${FUZZER_NAME} --cores 0 --input ./corpus 2>/dev/null >fuzz_stdout.log || true
116+
timeout 31s ./${FUZZER_NAME} --cores 0 --input ./corpus 2>/dev/null >fuzz_stdout.log || true
117117
'''
118118
dependencies = [ "fuzzer" ]
119119

‎fuzzers/libfuzzer_libpng_norestart/Makefile.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ rm -rf libafl_unix_shmem_server || true
104104
rm -rf corpus/ || true
105105
mkdir corpus/ || true
106106
cp seeds/* corpus/ || true
107-
timeout 11s ./${FUZZER_NAME} --cores 0 --input ./corpus 2>/dev/null >fuzz_stdout.log || true
107+
timeout 31s ./${FUZZER_NAME} --cores 0 --input ./corpus 2>/dev/null >fuzz_stdout.log || true
108108
if [ -z "$(grep "corpus: 30" fuzz_stdout.log)" ]; then
109109
echo "Fuzzer does not generate any testcases or any crashes"
110110
exit 1

‎fuzzers/libfuzzer_libpng_tcp_manager/Makefile.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ windows_alias = "unsupported"
161161
script_runner = "@shell"
162162
script='''
163163
rm -rf libafl_unix_shmem_server || true
164-
(timeout 11s ./${FUZZER_NAME} >fuzz_stdout.log 2>/dev/null || true) &
164+
(timeout 31s ./${FUZZER_NAME} >fuzz_stdout.log 2>/dev/null || true) &
165165
sleep 0.2
166-
timeout 10s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true
166+
timeout 30s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true
167167
if [ -z "$(grep "corpus: 30" fuzz_stdout.log)" ]; then
168168
echo "Fuzzer does not generate any testcases or any crashes"
169169
exit 1
@@ -177,9 +177,9 @@ dependencies = [ "fuzzer" ]
177177
script_runner = "@shell"
178178
script='''
179179
rm -rf libafl_unix_shmem_server || true
180-
(timeout 11s ./${FUZZER_NAME} >fuzz_stdout.log 2>/dev/null || true) &
180+
(timeout 31s ./${FUZZER_NAME} >fuzz_stdout.log 2>/dev/null || true) &
181181
sleep 0.2
182-
timeout 10s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true
182+
timeout 30s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true
183183
'''
184184
dependencies = [ "fuzzer" ]
185185

‎fuzzers/libfuzzer_stb_image/Makefile.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ windows_alias = "test_windows"
6262
script_runner = "@shell"
6363
script='''
6464
rm -rf libafl_unix_shmem_server || true
65-
(timeout 11s ./${FUZZER_NAME} >fuzz_stdout.log 2>/dev/null || true) &
65+
(timeout 31s ./${FUZZER_NAME} >fuzz_stdout.log 2>/dev/null || true) &
6666
sleep 0.2
67-
timeout 10s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true
67+
timeout 30s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true
6868
if [ -z "$(grep "corpus: 30" fuzz_stdout.log)" ]; then
6969
echo "Fuzzer does not generate any testcases or any crashes"
7070
exit 1
@@ -78,9 +78,9 @@ dependencies = [ "fuzzer" ]
7878
script_runner = "@shell"
7979
script='''
8080
rm -rf libafl_unix_shmem_server || true
81-
(timeout 11s ./${FUZZER_NAME} >fuzz_stdout.log 2>/dev/null || true) &
81+
(timeout 31s ./${FUZZER_NAME} >fuzz_stdout.log 2>/dev/null || true) &
8282
sleep 0.2
83-
timeout 10s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true
83+
timeout 30s ./${FUZZER_NAME} >/dev/null 2>/dev/null || true
8484
'''
8585
dependencies = [ "fuzzer"]
8686

‎fuzzers/libfuzzer_stb_image_sugar/Makefile.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ windows_alias = "test_windows"
6060
script_runner = "@shell"
6161
script='''
6262
rm -rf libafl_unix_shmem_server || true
63-
timeout 11s ./${FUZZER_NAME} 2>/dev/null >fuzz_stdout.log || true
63+
timeout 31s ./${FUZZER_NAME} 2>/dev/null >fuzz_stdout.log || true
6464
echo "The test is skipped. See https://github.com/AFLplusplus/LibAFL/issues/1176"
6565
'''
6666
dependencies = [ "fuzzer" ]

‎fuzzers/nautilus_sync/Makefile.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ windows_alias = "unsupported"
106106
script_runner = "@shell"
107107
script='''
108108
rm -rf libafl_unix_shmem_server || true
109-
timeout 11s ./${FUZZER_NAME} --cores 0 >fuzz_stdout.log 2>/dev/null || true
109+
timeout 31s ./${FUZZER_NAME} --cores 0 >fuzz_stdout.log 2>/dev/null || true
110110
if [ -z "$(grep "corpus: 8" fuzz_stdout.log)" ]; then
111111
echo "Fuzzer does not generate any testcases or any crashes"
112112
exit 1
@@ -120,7 +120,7 @@ dependencies = [ "fuzzer" ]
120120
script_runner = "@shell"
121121
script='''
122122
rm -rf libafl_unix_shmem_server || true
123-
timeout 11s ./${FUZZER_NAME} --cores 0 >fuzz_stdout.log 2>/dev/null || true
123+
timeout 31s ./${FUZZER_NAME} --cores 0 >fuzz_stdout.log 2>/dev/null || true
124124
'''
125125
dependencies = [ "fuzzer" ]
126126

0 commit comments

Comments
 (0)
Please sign in to comment.