diff --git a/Dockerfile b/Dockerfile index 540a0be..2a1333c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,12 +45,12 @@ RUN ./build-compiler-rt.sh $TOOLCHAIN_PREFIX WORKDIR /build ENV PATH=$TOOLCHAIN_PREFIX/bin:$PATH -COPY hello/*.c ./hello/ -RUN cd hello && \ +COPY test/*.c ./test/ +RUN cd test && \ for arch in $TOOLCHAIN_ARCHS; do \ $arch-w64-mingw32-clang hello.c -o hello-$arch.exe || exit 1; \ done -RUN cd hello && \ +RUN cd test && \ for arch in $TOOLCHAIN_ARCHS; do \ $arch-w64-mingw32-clang hello-tls.c -o hello-tls-$arch.exe || exit 1; \ done @@ -64,12 +64,12 @@ RUN ./build-libcxx.sh $TOOLCHAIN_PREFIX WORKDIR /build # Build C++ test applications -COPY hello/*.cpp ./hello/ -RUN cd hello && \ +COPY test/*.cpp ./test/ +RUN cd test && \ for arch in $TOOLCHAIN_ARCHS; do \ $arch-w64-mingw32-clang++ hello.cpp -o hello-cpp-$arch.exe -fno-exceptions || exit 1; \ done -RUN cd hello && \ +RUN cd test && \ for arch in $TOOLCHAIN_ARCHS; do \ $arch-w64-mingw32-clang++ hello-exception.cpp -o hello-exception-$arch.exe || exit 1; \ done diff --git a/run-tests.sh b/run-tests.sh index 838b65f..405da8d 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -11,7 +11,7 @@ export PATH=$PREFIX/bin:$PATH : ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}} -cd hello +cd test for arch in $ARCHS; do $arch-w64-mingw32-clang hello.c -o hello-$arch.exe $arch-w64-mingw32-clang hello-tls.c -o hello-tls-$arch.exe diff --git a/hello/.gitignore b/test/.gitignore similarity index 100% rename from hello/.gitignore rename to test/.gitignore diff --git a/hello/hello-exception.cpp b/test/hello-exception.cpp similarity index 100% rename from hello/hello-exception.cpp rename to test/hello-exception.cpp diff --git a/hello/hello-tls.c b/test/hello-tls.c similarity index 100% rename from hello/hello-tls.c rename to test/hello-tls.c diff --git a/hello/hello.c b/test/hello.c similarity index 100% rename from hello/hello.c rename to test/hello.c diff --git a/hello/hello.cpp b/test/hello.cpp similarity index 100% rename from hello/hello.cpp rename to test/hello.cpp