From 1f96291b04bab07cbd79cd1719c41ce5e7fb3de5 Mon Sep 17 00:00:00 2001
From: Zach Borboa <zachborboa@gmail.com>
Date: Wed, 9 Jun 2021 20:25:47 -0400
Subject: [PATCH] Run test script when testing inside containers

---
 tests/dockerfiles/php70/3_test.sh | 3 +--
 tests/dockerfiles/php71/3_test.sh | 3 +--
 tests/dockerfiles/php72/3_test.sh | 3 +--
 tests/dockerfiles/php73/3_test.sh | 3 +--
 tests/dockerfiles/php74/3_test.sh | 3 +--
 tests/dockerfiles/php80/3_test.sh | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/tests/dockerfiles/php70/3_test.sh b/tests/dockerfiles/php70/3_test.sh
index 62093e0..6ba37b2 100755
--- a/tests/dockerfiles/php70/3_test.sh
+++ b/tests/dockerfiles/php70/3_test.sh
@@ -10,8 +10,7 @@ export CI_PHP_VERSION="7.0" &&
     touch "/tmp/.composer_updated" ||
     exit 0
 ) &&
-bash "tests/before_script.sh" &&
-bash "tests/script.sh"
+bash "tests/run.sh"
 END
 )
 set -x
diff --git a/tests/dockerfiles/php71/3_test.sh b/tests/dockerfiles/php71/3_test.sh
index 9788f74..181c920 100755
--- a/tests/dockerfiles/php71/3_test.sh
+++ b/tests/dockerfiles/php71/3_test.sh
@@ -10,8 +10,7 @@ export CI_PHP_VERSION="7.1" &&
     touch "/tmp/.composer_updated" ||
     exit 0
 ) &&
-bash "tests/before_script.sh" &&
-bash "tests/script.sh"
+bash "tests/run.sh"
 END
 )
 set -x
diff --git a/tests/dockerfiles/php72/3_test.sh b/tests/dockerfiles/php72/3_test.sh
index 85db569..3eec9f8 100755
--- a/tests/dockerfiles/php72/3_test.sh
+++ b/tests/dockerfiles/php72/3_test.sh
@@ -10,8 +10,7 @@ export CI_PHP_VERSION="7.2" &&
     touch "/tmp/.composer_updated" ||
     exit 0
 ) &&
-bash "tests/before_script.sh" &&
-bash "tests/script.sh"
+bash "tests/run.sh"
 END
 )
 set -x
diff --git a/tests/dockerfiles/php73/3_test.sh b/tests/dockerfiles/php73/3_test.sh
index 8aecb70..3ce53c2 100755
--- a/tests/dockerfiles/php73/3_test.sh
+++ b/tests/dockerfiles/php73/3_test.sh
@@ -10,8 +10,7 @@ export CI_PHP_VERSION="7.3" &&
     touch "/tmp/.composer_updated" ||
     exit 0
 ) &&
-bash "tests/before_script.sh" &&
-bash "tests/script.sh"
+bash "tests/run.sh"
 END
 )
 set -x
diff --git a/tests/dockerfiles/php74/3_test.sh b/tests/dockerfiles/php74/3_test.sh
index f5a2b2a..549b52d 100755
--- a/tests/dockerfiles/php74/3_test.sh
+++ b/tests/dockerfiles/php74/3_test.sh
@@ -10,8 +10,7 @@ export CI_PHP_VERSION="7.4" &&
     touch "/tmp/.composer_updated" ||
     exit 0
 ) &&
-bash "tests/before_script.sh" &&
-bash "tests/script.sh"
+bash "tests/run.sh"
 END
 )
 set -x
diff --git a/tests/dockerfiles/php80/3_test.sh b/tests/dockerfiles/php80/3_test.sh
index 46f98df..495decd 100755
--- a/tests/dockerfiles/php80/3_test.sh
+++ b/tests/dockerfiles/php80/3_test.sh
@@ -10,8 +10,7 @@ export CI_PHP_VERSION="8.0" &&
     touch "/tmp/.composer_updated" ||
     exit 0
 ) &&
-bash "tests/before_script.sh" &&
-bash "tests/script.sh"
+bash "tests/run.sh"
 END
 )
 set -x