Move test related content into its own directory

pbatard · Feb 20, 2024 · 2a0e4b1 · 2a0e4b1
1 parent 467f173
commit 2a0e4b1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml
@@ -71,5 +71,5 @@ jobs:
     - name: Run tests
       run: |
          export QEMU_CMD="qemu-system-${{ matrix.QEMU_ARCH }} ${{ matrix.QEMU_OPTS }} -smbios type=0,vendor=\"GitHub Actions Test\",version=\"v1.0\" -L . -drive if=pflash,format=raw,unit=0,file=${{ matrix.FW_BASE }}.fd,readonly=on -drive format=raw,file=fat:rw:image -nodefaults -nographic -serial stdio -net none"
-         ./gen_tests.sh
-         ./run_tests.sh
+         ./tests/gen_tests.sh ./tests/test_list.txt
+         ./tests/run_tests.sh
diff --git a/chainload_test.7z → tests/chainload.7z b/chainload_test.7z → tests/chainload.7z
diff --git a/gen_tests.sh → tests/gen_tests.sh b/gen_tests.sh → tests/gen_tests.sh
@@ -3,13 +3,13 @@
 ## @file
 #  Test generation script for MD5Sum.
 #
-#  Copyright (c) 2023, Pete Batard <[email protected]>
+#  Copyright (c) 2023-2024, Pete Batard <[email protected]>
 #
 #  SPDX-License-Identifier: GPL-2.0-or-later
 #
 ##
 
-TEST_DIR=test
+TEST_DIR=./run
 
 rm -rf $TEST_DIR
 mkdir $TEST_DIR
@@ -37,4 +37,4 @@ while IFS=$'\r\n' read -r line; do
   elif [[ ! -z "$line" ]]; then
     echo "${line}" >> "$data_file"
   fi
-done < gen_tests.txt
+done < $1
diff --git a/run_tests.sh → tests/run_tests.sh b/run_tests.sh → tests/run_tests.sh
@@ -9,7 +9,7 @@
 #
 ##
 
-TEST_DIR=./test
+TEST_DIR=./run
 LINE_LEN=60
 TIMEOUT=2m
 MIN_TEST="${1:-001}"

diff --git a/gen_tests.txt → tests/test_list.txt b/gen_tests.txt → tests/test_list.txt
@@ -257,7 +257,7 @@
 < rm image/file*
 
 # Chainload original bootloader
-> 7z x chainload_test.7z -y -o./image/efi/boot
+> 7z x ./tests/chainload.7z -y -o./image/efi/boot
 > dd if=/dev/urandom of=image/file bs=1k count=64
 > (cd image; md5sum file* > md5sum.txt)
 1/1 file processed [0 failed]