tests: delete integv1 code (#3685)

* tests: delete integv1 code * update other references to integv1 * copy old integv1 trust store into pem directory * adding newline
aws · Dec 5, 2022 · c245b4a · c245b4a
1 parent cf07236
commit c245b4a
Show file tree

Hide file tree

Showing 31 changed files with 6 additions and 5,642 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,6 @@ docs/doxygen/output/
 libcrypto-build/*
 libcrypto-root
 libcrypto-root/*
-tests/integration/__pycache__
 tests/unit/*_test
 tests/fuzz/*_test
 tests/fuzz/*.txt

diff --git a/Makefile b/Makefile
@@ -59,10 +59,6 @@ libs:
 bin: libs
 	$(MAKE) -C bin
 
-.PHONY : integration
-integration: bin
-	$(MAKE) -C tests integration
-
 .PHONY : integrationv2
 integrationv2: bin
 	$(MAKE) -C tests integrationv2

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ git clone https://github.com/${YOUR_GITHUB_ACCOUNT_NAME}/s2n-tls.git
 cd s2n-tls
 
 # Pick an "env" line from the codebuild/codebuild.config file and run it, in this case choose the openssl-1.1.1 with GCC 9 build
-S2N_LIBCRYPTO=openssl-1.1.1 BUILD_S2N=true TESTS=integration GCC_VERSION=9
+S2N_LIBCRYPTO=openssl-1.1.1 BUILD_S2N=true TESTS=integrationv2 GCC_VERSION=9
 
 sudo codebuild/bin/s2n_install_test_dependencies.sh
 codebuild/bin/s2n_codebuild.sh

diff --git a/codebuild/spec/buildspec_ubuntu_integ_awslc.yml b/codebuild/spec/buildspec_ubuntu_integ_awslc.yml
diff --git a/codebuild/spec/buildspec_ubuntu_integ_boringlibre.yml b/codebuild/spec/buildspec_ubuntu_integ_boringlibre.yml
diff --git a/codebuild/spec/buildspec_ubuntu_integ_openssl102.yml b/codebuild/spec/buildspec_ubuntu_integ_openssl102.yml
diff --git a/codebuild/spec/buildspec_ubuntu_integ_openssl111.yml b/codebuild/spec/buildspec_ubuntu_integ_openssl111.yml
diff --git a/docker-images/ubuntu/Dockerfile b/docker-images/ubuntu/Dockerfile
@@ -10,7 +10,7 @@ ARG ZSH_THEME=cypher
 ENV GCC_VERSION=${GCC_VERSION} \
     BUILD_S2N=true \
     S2N_COVERAGE=false \
-    TESTS=integration \
+    TESTS=integrationv2 \
     LATEST_CLANG=true
 
 # The `s2n_setup_env` assumes bash, not sh
@@ -45,7 +45,7 @@ RUN set -eux; \
   # s2n setup\n\
   export BUILD_S2N=true\n\
   export GCC_VERSION='"$GCC_VERSION"$'\n\
-  export TESTS=integration\n\
+  export TESTS=integrationv2\n\
   export TEST_DEPS_DIR=/opt/s2n/test-deps\n\
   export PATH=$TEST_DEPS_DIR/clang/bin:$PATH\n\
   cd /home/s2n-dev/s2n && source /opt/s2n/codebuild/bin/s2n_setup_env.sh\n\
@@ -63,7 +63,7 @@ RUN set -eux; \
   export LD_LIBRARY_PATH=""; \
   . codebuild/bin/s2n_setup_env.sh; \
   export PATH=$TEST_DEPS_DIR/clang/bin:$PATH; \
-  TESTS=integration codebuild/bin/s2n_install_test_dependencies.sh; \
+  TESTS=integrationv2 codebuild/bin/s2n_install_test_dependencies.sh; \
   TESTS=benchmark codebuild/bin/s2n_install_test_dependencies.sh; \
   TESTS=fuzz codebuild/bin/s2n_install_test_dependencies.sh; \
   TESTS=unit BUILD_S2N=false S2N_LIBCRYPTO=openssl-1.0.2 codebuild/bin/install_default_dependencies.sh; \

diff --git a/tests/Makefile b/tests/Makefile
@@ -38,10 +38,6 @@ libs:
 	${MAKE} -C testlib
 	${MAKE} -C LD_PRELOAD
 
-.PHONY : integration
-integration:
-	${MAKE} -C integration
-
 .PHONY : integrationv2
 integrationv2:
 	${MAKE} -C integrationv2