From ceea244ec8fdefbd2262dd01e7f4d94ec5aea999 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Thu, 16 Jun 2022 08:44:33 -0500
Subject: [PATCH 1/3] build: output time spent on each setuponly test

---
 tests/setuponlytests/test.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/tests/setuponlytests/test.sh b/tests/setuponlytests/test.sh
index 36ac6a473f0..0ee64c82742 100644
--- a/tests/setuponlytests/test.sh
+++ b/tests/setuponlytests/test.sh
@@ -15,6 +15,13 @@ $logs
 "
 }
 
+delta() {
+  start=${1?}
+
+  now=$(date +%s)
+  echo "$((now - start))) seconds"
+}
+
 # tests that only run the setup files for things like downloads and configuration.
 setupOnlyMinecraftTest(){
   folder=$1
@@ -32,19 +39,22 @@ setupOnlyMinecraftTest(){
     fi
   fi
 
+  start=$(date +%s)
   if ! logs=$(docker-compose run mc 2>&1); then
     outputContainerLog "$logs"
     result=1
   elif [ -f verify.sh ]; then
     if ! docker run --rm --entrypoint bash -v "${PWD}/data":/data -v "${PWD}/verify.sh":/verify "${IMAGE_TO_TEST:-itzg/minecraft-server}" -e /verify; then
-      echo "Verify ${folder} FAILED"
+      now=$(date +%s)
+      echo "Verify ${folder} FAILED in $(delta start)"
       outputContainerLog "$logs"
       result=1
     else
-      echo "Verify ${folder} PASS"
+      now=$(date +%s)
+      echo "Verify ${folder} PASS in $(delta start)"
     fi
   else
-    echo "${folder} PASS"
+    echo "${folder} PASS in $(delta start)"
   fi
 
   docker-compose down -v --remove-orphans > /dev/null

From f0427f879a1b4f963f27a5b5e53e8719c582acc9 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Fri, 17 Jun 2022 16:36:44 -0500
Subject: [PATCH 2/3] Try fixing `delta` expression

---
 tests/setuponlytests/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/setuponlytests/test.sh b/tests/setuponlytests/test.sh
index 0ee64c82742..eca7cceb586 100644
--- a/tests/setuponlytests/test.sh
+++ b/tests/setuponlytests/test.sh
@@ -19,7 +19,7 @@ delta() {
   start=${1?}
 
   now=$(date +%s)
-  echo "$((now - start))) seconds"
+  echo "$(( now - start ))) seconds"
 }
 
 # tests that only run the setup files for things like downloads and configuration.

From 647d9a2487bebc38ec24f600537fd4f8fe1abc9d Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 18 Jun 2022 09:30:37 -0500
Subject: [PATCH 3/3] Corrected expression syntax

---
 examples/docker-compose-generic-pack-atm7.yml | 19 +++++++++++++++++++
 tests/setuponlytests/test.sh                  | 16 ++++++++--------
 2 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 examples/docker-compose-generic-pack-atm7.yml

diff --git a/examples/docker-compose-generic-pack-atm7.yml b/examples/docker-compose-generic-pack-atm7.yml
new file mode 100644
index 00000000000..edcfa1b1628
--- /dev/null
+++ b/examples/docker-compose-generic-pack-atm7.yml
@@ -0,0 +1,19 @@
+version: '3.8'
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    volumes:
+    - ./data:/data
+    - ./modpacks:/modpacks:ro
+    environment:
+      EULA: "true"
+      MEMORY: 2G
+      TYPE: FORGE
+      VERSION: 1.18.2
+      FORGEVERSION: 40.1.30
+      # Need to download Server-Files-0.4.13.zip and
+      # put it in modpacks directory next to this compose file
+      GENERIC_PACK: /modpacks/Server-Files-0.4.13.zip
+    ports:
+      - "25565:25565"
diff --git a/tests/setuponlytests/test.sh b/tests/setuponlytests/test.sh
index eca7cceb586..412839c012c 100644
--- a/tests/setuponlytests/test.sh
+++ b/tests/setuponlytests/test.sh
@@ -16,10 +16,10 @@ $logs
 }
 
 delta() {
-  start=${1?}
+  startTime=${1?}
 
-  now=$(date +%s)
-  echo "$(( now - start ))) seconds"
+  endTime=$(date +%s)
+  echo "$(( endTime - startTime )) seconds"
 }
 
 # tests that only run the setup files for things like downloads and configuration.
@@ -45,16 +45,16 @@ setupOnlyMinecraftTest(){
     result=1
   elif [ -f verify.sh ]; then
     if ! docker run --rm --entrypoint bash -v "${PWD}/data":/data -v "${PWD}/verify.sh":/verify "${IMAGE_TO_TEST:-itzg/minecraft-server}" -e /verify; then
-      now=$(date +%s)
-      echo "Verify ${folder} FAILED in $(delta start)"
+      endTime=$(date +%s)
+      echo "${folder} FAILED verify in $(delta start)"
       outputContainerLog "$logs"
       result=1
     else
-      now=$(date +%s)
-      echo "Verify ${folder} PASS in $(delta start)"
+      endTime=$(date +%s)
+      echo "${folder} PASSED verify in $(delta start)"
     fi
   else
-    echo "${folder} PASS in $(delta start)"
+    echo "${folder} PASSED in $(delta start)"
   fi
 
   docker-compose down -v --remove-orphans > /dev/null