4 files changed, 52 insertions, 51 deletions
diff --git a/ci/build.sh b/ci/build.sh
index 1d334e7d..8ab28c88 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -ex
-# This script is used by travis.yml and docker.sh
+# This script is used by .travis.yml and build-in-docker
 
 if [ -n "${SPECIAL}" ]; then
   sh ci/${SPECIAL}.sh
diff --git a/docker.sh b/misc/build-in-docker
index fe4de97e..fe4de97e 100755
--- a/docker.sh
+++ b/misc/build-in-docker
diff --git a/misc/test-all-systems b/misc/test-all-systems
new file mode 100755
index 00000000..39d4e849
--- /dev/null
+++ b/misc/test-all-systems
@@ -0,0 +1,51 @@
+#!/bin/sh -ex
+
+# While it's obviously quite impossible to support and test every single distribution,
+# this script enables easy checking of the most common standard distributions at least.
+
+# Runtime is roughly 1 minute per line (depending on system).
+# First run takes about 1 additional minute per docker image (depending on internet connection).
+
+# Note: Currently this is more a reference on how to run each instance,
+#       instead of running this entire script at once. See next steps.
+
+# Next steps:
+# * run compilation, tests and/or docker instances in parallel to improve runtime.
+
+echo "Warning: Docker support is rather experimental\n"
+
+build_in_docker=$(dirname $0)/build-in-docker
+
+# Debian
+
+  # See https://github.com/ccache/ccache/issues/602
+  #CC=gcc   CXX=g++     $build_in_docker debian-9-stretch
+  #CC=clang CXX=clang++ $build_in_docker debian-9-stretch
+
+  CC=gcc   CXX=g++     $build_in_docker debian-10-buster
+  CC=clang CXX=clang++ $build_in_docker debian-10-buster
+
+
+# Ubuntu (ancient, old and latest)
+
+  # zstd not available for Ubuntu 14.
+  CC=gcc   CXX=g++     CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker ubuntu-14-trusty
+
+  # See https://github.com/ccache/ccache/issues/601
+  #CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker ubuntu-14-tusty
+
+  CC=gcc   CXX=g++     $build_in_docker ubuntu-16-xenial
+  CC=clang CXX=clang++ $build_in_docker ubuntu-16-xenial
+
+  CC=gcc   CXX=g++     CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker ubuntu-20-focal
+  CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker ubuntu-20-focal
+
+
+# Alpine (old and latest)
+
+  CC=gcc   CXX=g++     CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker alpine-3.4
+  # Clang is not capable to compile libzstd from internet before alpine 3.12 (Some SSE2 error regarding missing file emmintrin.h)
+  #CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker alpine-3.4
+  CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" $build_in_docker alpine-3.12
+  CC=gcc   CXX=g++     $build_in_docker alpine-3.12
+  CC=clang CXX=clang++ $build_in_docker alpine-3.12
diff --git a/test-all-systems.sh b/test-all-systems.sh
deleted file mode 100755
index 48c28605..00000000
--- a/test-all-systems.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh -ex
-
-# While it's obviously quite impossible to support and test every single distribution,
-# this script enables easy checking of the most common standard distributions at least.
-
-# Runtime is roughly 1 minute per line (depending on system).
-# First run takes about 1 additional minute per docker image (depending on internet connection).
-
-# Note: Currently this is more a reference on how to run each instance,
-#       instead of running this entire script at once. See next steps.
-
-# Next steps:
-# * run compilation, tests and/or docker instances in parallel to improve runtime.
-
-echo "Warning: Docker support is rather experimental\n"
-
-
-# Debian
-
-  # See https://github.com/ccache/ccache/issues/602
-  #CC=gcc   CXX=g++     ./docker.sh debian-9-stretch
-  #CC=clang CXX=clang++ ./docker.sh debian-9-stretch
-
-  CC=gcc   CXX=g++     ./docker.sh debian-10-buster
-  CC=clang CXX=clang++ ./docker.sh debian-10-buster
-
-
-# Ubuntu (ancient, old and latest)
-
-  # zstd not available for Ubuntu 14.
-  CC=gcc   CXX=g++     CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" ./docker.sh ubuntu-14-trusty
-
-  # See https://github.com/ccache/ccache/issues/601
-  #CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" ./docker.sh ubuntu-14-tusty
-
-  CC=gcc   CXX=g++     ./docker.sh ubuntu-16-xenial
-  CC=clang CXX=clang++ ./docker.sh ubuntu-16-xenial
-
-  CC=gcc   CXX=g++     CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" ./docker.sh ubuntu-20-focal
-  CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" ./docker.sh ubuntu-20-focal
-
-
-# Alpine (old and latest)
-
-  CC=gcc   CXX=g++     CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" ./docker.sh alpine-3.4
-  # Clang is not capable to compile libzstd from internet before alpine 3.12 (Some SSE2 error regarding missing file emmintrin.h)
-  #CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" ./docker.sh alpine-3.4
-  CC=clang CXX=clang++ CMAKE_PARAMS="-DZSTD_FROM_INTERNET=ON" ./docker.sh alpine-3.12
-  CC=gcc   CXX=g++     ./docker.sh alpine-3.12
-  CC=clang CXX=clang++ ./docker.sh alpine-3.12