rm codecov

aws · Aug 3, 2022 · 8d623b7 · 8d623b7
1 parent fd9eb4d
commit 8d623b7
Show file tree

Hide file tree

Showing 18 changed files with 8 additions and 159 deletions.
diff --git a/Makefile b/Makefile
@@ -92,18 +92,7 @@ benchmark: bin
 	$(MAKE) -C tests benchmark
 
 .PHONY : coverage
-coverage: run-gcov run-lcov run-genhtml
-
-.PHONY : run-gcov
-run-gcov:
-	$(MAKE) -C bin gcov
-	$(MAKE) -C crypto gcov
-	$(MAKE) -C error gcov
-	$(MAKE) -C pq-crypto run-gcov
-	$(MAKE) -C stuffer gcov
-	$(MAKE) -C tests gcov
-	$(MAKE) -C tls run-gcov
-	$(MAKE) -C utils gcov
+coverage: run-lcov run-genhtml
 
 .PHONY : run-lcov
 run-lcov:

diff --git a/codebuild/README.md b/codebuild/README.md
@@ -35,8 +35,6 @@ General flow of the CodeBuild Test Projects
         - codebuild/run_ctverif.sh
         - codebuild/run_sidetrail.sh
         - codebuild/grep_simple_mistakes.sh
-    - codebuild/s2n_after_codebuild.sh
-        - curl -s https://codecov.io/bash
 
 
 ### Usage to setup Projects

diff --git a/codebuild/bin/s2n_after_codebuild.sh b/codebuild/bin/s2n_after_codebuild.sh
diff --git a/codebuild/bin/s2n_codebuild.sh b/codebuild/bin/s2n_codebuild.sh
@@ -83,9 +83,3 @@ if [[ "$TESTS" == "sawHMAC" ]] && [[ "$OS_NAME" == "linux" ]]; then make -C test
 if [[ "$TESTS" == "sawDRBG" ]]; then make -C tests/saw tmp/verify_drbg.log ; fi
 if [[ "$TESTS" == "ALL" || "$TESTS" == "tls" ]]; then make -C tests/saw tmp/verify_handshake.log ; fi
 if [[ "$TESTS" == "sawHMACFailure" ]]; then make -C tests/saw failure-tests ; fi
-
-# Generate *.gcov files that can be picked up by the CodeCov.io Bash helper script. Don't run lcov or genhtml
-# since those will delete .gcov files as they're processed.
-if [[ "$CODECOV_IO_UPLOAD" == "true" && "$FUZZ_COVERAGE" != "true" ]]; then
-    make run-gcov;
-fi
diff --git a/codebuild/codebuild.config b/codebuild/codebuild.config
@@ -10,7 +10,7 @@ stack_name: s2nCodeBuildTests
 # Fuzzers
 [CodeBuild:s2nfuzzerOpenSSL111Coverage]
 snippet: UbuntuFuzzJob
-env: S2N_LIBCRYPTO=openssl-1.1.1 LATEST_CLANG=true TESTS=fuzz FUZZ_TIMEOUT_SEC=60 FUZZ_COVERAGE=true CODECOV_IO_UPLOAD=true
+env: S2N_LIBCRYPTO=openssl-1.1.1 LATEST_CLANG=true TESTS=fuzz FUZZ_TIMEOUT_SEC=60 FUZZ_COVERAGE=true
 
 [CodeBuild:s2nfuzzerOpenSSL102FIPS]
 snippet: UbuntuFuzzJob
@@ -28,7 +28,7 @@ env: S2N_LIBCRYPTO=libressl BUILD_S2N=true TESTS=integration GCC_VERSION=9
 
 [CodeBuild:s2nIntegrationOpenSSL111Gcc6Coverage]
 snippet: UbuntuBoilerplate2XL
-env: S2N_LIBCRYPTO=openssl-1.1.1 BUILD_S2N=true TESTS=integration GCC_VERSION=6 S2N_COVERAGE=true CODECOV_IO_UPLOAD=true
+env: S2N_LIBCRYPTO=openssl-1.1.1 BUILD_S2N=true TESTS=integration GCC_VERSION=6 S2N_COVERAGE=true
 
 [CodeBuild:s2nIntegrationOpenSSL111Gcc6Corked]
 snippet: UbuntuBoilerplate2XL
@@ -53,7 +53,7 @@ env: S2N_LIBCRYPTO=boringssl BUILD_S2N=true TESTS=integration GCC_VERSION=9
 # Asan Test
 [CodeBuild:s2nAsanOpenSSL111Gcc6Coverage]
 snippet: UbuntuBoilerplateLarge
-env: S2N_LIBCRYPTO=openssl-1.1.1 BUILD_S2N=true TESTS=asan GCC_VERSION=6 S2N_COVERAGE=true CODECOV_IO_UPLOAD=true
+env: S2N_LIBCRYPTO=openssl-1.1.1 BUILD_S2N=true TESTS=asan GCC_VERSION=6 S2N_COVERAGE=true
 
 #Valgrind Test
 [CodeBuild:s2nValgrindOpenSSL111Gcc9]

diff --git a/codebuild/spec/buildspec_omnibus.yml b/codebuild/spec/buildspec_omnibus.yml
@@ -113,8 +113,6 @@ batch:
           S2N_LIBCRYPTO: 'openssl-1.1.1'
           BUILD_S2N: 'true'
           S2N_COVERAGE: 'true'
-          CODECOV_IO_UPLOAD: 'true'
-          CODECOV_TOKEN: 'e460b7c1-6019-4a50-b65d-555c4a8fbc22'
 
     - identifier: s2nAsanOpenssl102
       buildspec: codebuild/spec/buildspec_ubuntu.yml
@@ -187,20 +185,19 @@ batch:
         variables:
           GCC_VERSION: '6'
           TESTS: crt
-          
+
     - buildspec: codebuild/spec/buildspec_ubuntu.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
         privileged-mode: true
         variables:
           BUILD_S2N: true
-          CODECOV_IO_UPLOAD: true
           GCC_VERSION: 6
           S2N_COVERAGE: true
           S2N_LIBCRYPTO: openssl-1.1.1
           TESTS: unit
       identifier: s2nUnitOpenSSL111Gcc6Coverage
-      
+
     - buildspec: codebuild/spec/buildspec_ubuntu.yml
       env:
         compute-type: BUILD_GENERAL1_SMALL
@@ -212,7 +209,7 @@ batch:
           S2N_NO_PQ: 1
           TESTS: unit
       identifier: s2nUnitLibressl
-      
+
     - buildspec: codebuild/spec/buildspec_ubuntu.yml
       env:
         compute-type: BUILD_GENERAL1_SMALL
@@ -238,7 +235,6 @@ batch:
           TESTS: fuzz
           FUZZ_TIMEOUT_SEC: 60
           FUZZ_COVERAGE: true
-          CODECOV_IO_UPLOAD: true
 
     - identifier: s2nFuzzerOpenSSL102
       buildspec: codebuild/spec/buildspec_ubuntu_fuzz_artifacts.yml

diff --git a/codebuild/spec/buildspec_sidetrail.yml b/codebuild/spec/buildspec_sidetrail.yml
@@ -50,5 +50,3 @@ phases:
   post_build:
     commands:
       - echo Build completed on `date`
-      - echo Uploading CodeCov.io artifacts
-      - $CB_BIN_DIR/s2n_after_codebuild.sh
diff --git a/codebuild/spec/buildspec_ubuntu.yml b/codebuild/spec/buildspec_ubuntu.yml
@@ -62,5 +62,3 @@ phases:
   post_build:
     commands:
       - echo Build completed on `date`
-      - echo Uploading CodeCov.io artifacts
-      - $CB_BIN_DIR/s2n_after_codebuild.sh
diff --git a/codebuild/spec/buildspec_ubuntu_fuzz_artifacts.yml b/codebuild/spec/buildspec_ubuntu_fuzz_artifacts.yml
@@ -62,8 +62,6 @@ phases:
   post_build:
     commands:
       - echo Build completed on `date`
-      - echo Uploading CodeCov.io artifacts
-      - $CB_BIN_DIR/s2n_after_codebuild.sh
 artifacts:
   files:
     - "./tests/fuzz/corpus/$FUZZ_TESTS/*"

diff --git a/codebuild/spec/buildspec_ubuntu_integ_awslc.yml b/codebuild/spec/buildspec_ubuntu_integ_awslc.yml
@@ -61,5 +61,3 @@ phases:
   post_build:
     commands:
       - echo Build completed on `date`
-      - echo Uploading CodeCov.io artifacts
-      - $CB_BIN_DIR/s2n_after_codebuild.sh
diff --git a/codebuild/spec/buildspec_ubuntu_integ_boringlibre.yml b/codebuild/spec/buildspec_ubuntu_integ_boringlibre.yml
@@ -56,5 +56,3 @@ phases:
   post_build:
     commands:
       - echo Build completed on `date`
-      - echo Uploading CodeCov.io artifacts
-      - $CB_BIN_DIR/s2n_after_codebuild.sh
diff --git a/codebuild/spec/buildspec_ubuntu_integ_openssl102.yml b/codebuild/spec/buildspec_ubuntu_integ_openssl102.yml
@@ -56,5 +56,3 @@ phases:
   post_build:
     commands:
       - echo Build completed on `date`
-      - echo Uploading CodeCov.io artifacts
-      - $CB_BIN_DIR/s2n_after_codebuild.sh
diff --git a/codebuild/spec/buildspec_ubuntu_integ_openssl102_asanvalgrind.yml b/codebuild/spec/buildspec_ubuntu_integ_openssl102_asanvalgrind.yml
@@ -56,5 +56,3 @@ phases:
   post_build:
     commands:
       - echo Build completed on `date`
-      - echo Uploading CodeCov.io artifacts
-      - $CB_BIN_DIR/s2n_after_codebuild.sh
diff --git a/codebuild/spec/buildspec_ubuntu_integ_openssl111.yml b/codebuild/spec/buildspec_ubuntu_integ_openssl111.yml
@@ -51,10 +51,8 @@ phases:
     commands:
       - printenv
       - S2N_LIBCRYPTO=openssl-1.1.1 GCC_VERSION=4.8 $CB_BIN_DIR/s2n_codebuild.sh
-      - S2N_LIBCRYPTO=openssl-1.1.1 TESTS=integration GCC_VERSION=6 S2N_COVERAGE=true CODECOV_IO_UPLOAD=true $CB_BIN_DIR/s2n_codebuild.sh
+      - S2N_LIBCRYPTO=openssl-1.1.1 TESTS=integration GCC_VERSION=6 S2N_COVERAGE=true $CB_BIN_DIR/s2n_codebuild.sh
       - S2N_LIBCRYPTO=openssl-1.1.1 TESTS=integration GCC_VERSION=6 S2N_CORKED_IO=true $CB_BIN_DIR/s2n_codebuild.sh
   post_build:
     commands:
       - echo Build completed on `date`
-      - echo Uploading CodeCov.io artifacts
-      - $CB_BIN_DIR/s2n_after_codebuild.sh
diff --git a/codecov.yml b/codecov.yml
diff --git a/pq-crypto/Makefile b/pq-crypto/Makefile
@@ -30,10 +30,6 @@ all: $(OBJS)
 	$(MAKE) -C kyber_r3
 endif
 
-.PHONY : run-gcov
-run-gcov: gcov
-	$(MAKE) -C kyber_r3 gcov
-
 .PHONY : run-lcov
 run-lcov: lcov
 	$(MAKE) -C kyber_r3 lcov

diff --git a/s2n.mk b/s2n.mk
@@ -169,8 +169,6 @@ endif
 ifndef COV_TOOL
 	ifneq ("$(wildcard $(LLVM_GCOV_MARKER_FILE))","")
 		COV_TOOL=llvm-gcov.sh
-	else
-		COV_TOOL=gcov
 	endif
 endif
 
@@ -261,10 +259,6 @@ INDENTOPTS = -npro -kr -i4 -ts4 -nut -sob -l180 -ss -ncs -cp1
 indentsource:
 	( for source in ${SOURCES} ; do ${INDENT} ${INDENTOPTS} $$source; done )
 
-.PHONY : gcov
-gcov: 
-	( for source in ${SOURCES} ; do $(COV_TOOL) $$source;  done )
-
 .PHONY : lcov
 lcov: 
 	lcov --capture --directory . --gcov-tool $(COV_TOOL) --output ./coverage.info

diff --git a/tls/Makefile b/tls/Makefile
@@ -31,10 +31,6 @@ all: $(OBJS)
 bc: $(BCS)
 	$(foreach subfolder, $(SUB_BUILDS), $(MAKE) -C $(subfolder) bc)
 
-.PHONY : run-gcov
-run-gcov: gcov
-	$(foreach subfolder, $(SUB_BUILDS), $(MAKE) -C $(subfolder) gcov)
-
 .PHONY : run-lcov
 run-lcov: lcov
 	$(foreach subfolder, $(SUB_BUILDS), $(MAKE) -C $(subfolder) lcov)