From 975ed2498413ae61518a8ee02acaf4766764c77a Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Mon, 11 Mar 2019 13:56:54 +0100
Subject: [PATCH] tests: set the output folder in one variable

And use it everywhere
---
 run-tests.sh | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/run-tests.sh b/run-tests.sh
index b2f191c..3d726f0 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -34,29 +34,30 @@ TESTS_SSP="stacksmash"
 TESTS_ASAN="stacksmash"
 TESTS_UBSAN="ubsan"
 for arch in $ARCHS; do
-    mkdir -p $arch
+    TEST_DIR="$arch"
+    mkdir -p $TEST_DIR
     for test in $TESTS_C; do
-        $arch-w64-mingw32-clang $test.c -o $arch/$test.exe
+        $arch-w64-mingw32-clang $test.c -o $TEST_DIR/$test.exe
     done
     for test in $TESTS_C_DLL; do
-        $arch-w64-mingw32-clang $test.c -shared -o $arch/$test.dll -Wl,--out-implib,$arch/lib$test.dll.a
+        $arch-w64-mingw32-clang $test.c -shared -o $TEST_DIR/$test.dll -Wl,--out-implib,$TEST_DIR/lib$test.dll.a
     done
     for test in $TESTS_C_LINK_DLL; do
-        $arch-w64-mingw32-clang $test.c -o $arch/$test.exe -L$arch -l${test%-main}-lib
+        $arch-w64-mingw32-clang $test.c -o $TEST_DIR/$test.exe -L$TEST_DIR -l${test%-main}-lib
     done
     TESTS_EXTRA=""
     for test in $TESTS_C_NO_BUILTIN; do
-        $arch-w64-mingw32-clang $test.c -o $arch/$test-no-builtin.exe -fno-builtin
+        $arch-w64-mingw32-clang $test.c -o $TEST_DIR/$test-no-builtin.exe -fno-builtin
         TESTS_EXTRA="$TESTS_EXTRA $test-no-builtin"
     done
     for test in $TESTS_CPP; do
-        $arch-w64-mingw32-clang++ $test.cpp -o $arch/$test.exe
+        $arch-w64-mingw32-clang++ $test.cpp -o $TEST_DIR/$test.exe
     done
     for test in $TESTS_CPP_DLL; do
-        $arch-w64-mingw32-clang++ $test.cpp -shared -o $arch/$test.dll
+        $arch-w64-mingw32-clang++ $test.cpp -shared -o $TEST_DIR/$test.dll
     done
     for test in $TESTS_SSP; do
-        $arch-w64-mingw32-clang $test.c -o $arch/$test.exe -fstack-protector-strong
+        $arch-w64-mingw32-clang $test.c -o $TEST_DIR/$test.exe -fstack-protector-strong
     done
     # These aren't run, since asan doesn't work within wine.
     for test in $TESTS_ASAN; do
@@ -65,7 +66,7 @@ for arch in $ARCHS; do
         i686|x86_64) ;;
         *) continue ;;
         esac
-        $arch-w64-mingw32-clang $test.c -o $arch/$test-asan.exe -fsanitize=address -g -gcodeview -Wl,-pdb,$arch/$test-asan.pdb
+        $arch-w64-mingw32-clang $test.c -o $TEST_DIR/$test-asan.exe -fsanitize=address -g -gcodeview -Wl,-pdb,$arch/$test-asan.pdb
     done
     for test in $TESTS_UBSAN; do
         case $arch in
@@ -74,7 +75,7 @@ for arch in $ARCHS; do
         i686|x86_64) ;;
         *) continue ;;
         esac
-        $arch-w64-mingw32-clang $test.c -o $arch/$test.exe -fsanitize=undefined
+        $arch-w64-mingw32-clang $test.c -o $TEST_DIR/$test.exe -fsanitize=undefined
         TESTS_EXTRA="$TESTS_EXTRA $test"
     done
     DLL="$TESTS_C_DLL $TESTS_CPP_DLL"
@@ -98,11 +99,11 @@ for arch in $ARCHS; do
     fi
     for i in libc++ libunwind libssp-0 libclang_rt.asan_dynamic-$compiler_rt_arch; do
         if [ -f $PREFIX/$arch-w64-mingw32/bin/$i.dll ]; then
-            cp $PREFIX/$arch-w64-mingw32/bin/$i.dll $arch
+            cp $PREFIX/$arch-w64-mingw32/bin/$i.dll $TEST_DIR
             DLL="$DLL $i"
         fi
     done
-    cd $arch
+    cd $TEST_DIR
     if [ -n "$COPY" ]; then
         for i in $DLL; do
             $COPY $i.dll