From 416fea5fadf76b72f9eef1e82679b49b9d78c3e0 Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers3@gmail.com>
Date: Sun, 18 Oct 2020 14:21:26 -0700
Subject: [PATCH] scripts/run_tests.sh: remove checksum_benchmarks

The reason that run_tests.sh supported running checksum_benchmarks.sh is
that as a side effect, checksum_benchmarks.sh runs the 'test_checksums'
program with all combinations of CPU features.

However, commit ec60cb48d11c ("tools/run_tests.sh: test different
combinations of CPU features") made run_tests.sh handle this elsewhere.

So having run_tests.sh run checksum_benchmarks.sh is no longer useful.

Keep checksum_benchmarks.sh around for manual benchmark runs, however.
---
 .travis.yml          | 16 ++--------------
 scripts/run_tests.sh |  8 --------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 17cd49f..14bc1c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,14 +15,12 @@ matrix:
       script:
         - scripts/run_tests.sh native freestanding
 
-    - name: Checksum and static analysis tests (Linux)
+    - name: clang static analyzer
       os: linux
       dist: bionic
       before_install:
-        - sudo apt-get install -y libz-dev gcc-multilib libz-dev:i386
-          libc6-dev-i386 clang
+        - sudo apt-get install -y clang
       script:
-        - scripts/run_tests.sh checksum_benchmarks
         - make scan-build
 
     - name: Native tests (Linux aarch64)
@@ -34,16 +32,6 @@ matrix:
       script:
         - scripts/run_tests.sh native freestanding
 
-    - name: Checksum and static analysis tests (Linux aarch64)
-      os: linux
-      dist: bionic
-      arch: arm64
-      before_install:
-        - sudo apt-get install -y libz-dev clang
-      script:
-        - scripts/run_tests.sh checksum_benchmarks
-        - make scan-build
-
     - name: gzip and cross-compile-for-Windows tests (Linux)
       os: linux
       dist: bionic
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
index bcbe54d..17775ce 100755
--- a/scripts/run_tests.sh
+++ b/scripts/run_tests.sh
@@ -209,13 +209,6 @@ freestanding_tests() {
 
 ###############################################################################
 
-checksum_benchmarks() {
-	test_group_included checksum_benchmarks || return 0
-	./scripts/checksum_benchmarks.sh
-}
-
-###############################################################################
-
 windows_tests() {
 	local arch
 
@@ -271,7 +264,6 @@ log "	TESTDATA=$TESTDATA"
 
 native_tests
 freestanding_tests
-checksum_benchmarks
 windows_tests
 gzip_tests