fix profraw path

aws · Dec 12, 2024 · 96ebc85 · 96ebc85
1 parent 8e1310a
commit 96ebc85
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/codebuild/bin/fuzz_corpus_upload.sh b/codebuild/bin/fuzz_corpus_upload.sh
@@ -26,9 +26,5 @@ for FUZZ_TEST in tests/fuzz/*.c; do
     # Store generated corpus files in the S3 bucket.
     zip -r ./tests/fuzz/corpus/${TEST_NAME}.zip ./tests/fuzz/corpus/${TEST_NAME}/ > /dev/null 2>&1
     aws s3 cp ./tests/fuzz/corpus/${TEST_NAME}.zip s3://s2n-tls-fuzz-corpus/${TEST_NAME}/corpus.zip
-
-    # Store generated output files in the S3 bucket.
-    aws s3 cp ./tests/fuzz/${TEST_NAME}_output.txt ${ARTIFACT_UPLOAD_LOC}/${TEST_NAME}/output_$(date +%Y-%m-%d-%T).txt
-    aws s3 cp ./tests/fuzz/${TEST_NAME}_results.txt ${ARTIFACT_UPLOAD_LOC}/${TEST_NAME}/results_$(date +%Y-%m-%d-%T).txt
 done
 
diff --git a/codebuild/bin/fuzz_coverage_report.sh b/codebuild/bin/fuzz_coverage_report.sh
@@ -37,16 +37,16 @@ for FUZZ_TEST in "$FUZZ_TEST_DIR"/*.c; do
     TEST_NAME="${TEST_NAME%.*}"
 
     llvm-profdata merge \
-        -sparse ./tests/fuzz/profiles/${TEST_NAME}/*.profraw \
-        -o ./tests/fuzz/profiles/${TEST_NAME}/${TEST_NAME}.profdata
+        -sparse tests/fuzz/profiles/${TEST_NAME}/*.profraw \
+        -o tests/fuzz/profiles/${TEST_NAME}/${TEST_NAME}.profdata
 
     llvm-cov report \
-        -instr-profile=./tests/fuzz/profiles/${TEST_NAME}/${TEST_NAME}.profdata ./build/lib/libs2n.so ${FUZZCOV_SOURCES} \
+        -instr-profile=tests/fuzz/profiles/${TEST_NAME}/${TEST_NAME}.profdata build/lib/libs2n.so ${FUZZCOV_SOURCES} \
         -show-functions \
         > coverage/fuzz/${TEST_NAME}_cov.txt
 
     llvm-cov export \
-        -instr-profile=./tests/fuzz/profiles/${TEST_NAME}/${TEST_NAME}.profdata ./build/lib/libs2n.so ${FUZZCOV_SOURCES} \
+        -instr-profile=tests/fuzz/profiles/${TEST_NAME}/${TEST_NAME}.profdata build/lib/libs2n.so ${FUZZCOV_SOURCES} \
         -format=lcov \
         > coverage/fuzz/${TEST_NAME}_cov.info
 

diff --git a/tests/fuzz/runFuzzTest.sh b/tests/fuzz/runFuzzTest.sh
@@ -125,5 +125,8 @@ then
 else
     cat ${TEST_NAME}_output.txt
     printf "\033[31;1mFAILED\033[0m %s, %6d features covered\n" "$TEST_INFO" $FEATURE_COVERAGE
+    # Store generated output files in the S3 bucket for debugging.
+    aws s3 cp ./tests/fuzz/${TEST_NAME}_output.txt ${ARTIFACT_UPLOAD_LOC}/${TEST_NAME}/output_$(date +%Y-%m-%d-%T).txt
+    aws s3 cp ./tests/fuzz/${TEST_NAME}_results.txt ${ARTIFACT_UPLOAD_LOC}/${TEST_NAME}/results_$(date +%Y-%m-%d-%T).txt
     exit -1
 fi