Skip to content

Commit b8543a8

Browse files
FelixoidFelixoid
committed
Move integration tests related stuff to subdir
1 parent 951e247 commit b8543a8

File tree

22 files changed

+23
-23
lines changed

22 files changed

+23
-23
lines changed

‎.github/workflows/integration-tests.yml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -418,8 +418,8 @@ jobs:
418418
sudo apt install -y nginx-full
419419
420420
mkdir /tmp/static
421-
cp `pwd`/tests/htpasswd /tmp/htpasswd
422-
nginx -c `pwd`/tests/nginx_http_cache.conf
421+
cp `pwd`/tests/integration/htpasswd /tmp/htpasswd
422+
nginx -c `pwd`/tests/integration/nginx_http_cache.conf
423423
424424
- name: Install rust
425425
uses: ./.github/actions/rust-toolchain
@@ -476,7 +476,7 @@ jobs:
476476

477477
- name: Compile MSVC (no cache)
478478
shell: bash
479-
working-directory: ./tests/msvc
479+
working-directory: ./tests/integration/msvc
480480
run: |
481481
cl "@args.rsp"
482482
test -e ./foo.o || { echo "No compiler output found"; exit -1; }
@@ -487,7 +487,7 @@ jobs:
487487

488488
- name: Compile - Cache Miss
489489
shell: bash
490-
working-directory: ./tests/msvc
490+
working-directory: ./tests/integration/msvc
491491
run: |
492492
rm ./foo.o || true
493493
$SCCACHE_EXE "$(where cl.exe)" -c "@args.rsp"
@@ -498,7 +498,7 @@ jobs:
498498
499499
- name: Compile - Cache Hit
500500
shell: bash
501-
working-directory: ./tests/msvc
501+
working-directory: ./tests/integration/msvc
502502
run: |
503503
rm ./foo.o || true
504504
$SCCACHE_EXE "$(where cl.exe)" -c "@args.rsp"
@@ -509,7 +509,7 @@ jobs:
509509
510510
- name: Compile - Preprocessing Compiler Bug
511511
shell: bash
512-
working-directory: ./tests/msvc-preprocessing
512+
working-directory: ./tests/integration/msvc-preprocessing
513513
run: |
514514
$SCCACHE_EXE "$(where cl.exe)" -c "@args.rsp"
515515
$SCCACHE_EXE --show-stats
@@ -559,7 +559,7 @@ jobs:
559559
- name: Test C/C++
560560
run: |
561561
export CXX="${SCCACHE_PATH} clang++"
562-
$CXX -c `pwd`/tests/test_clang_multicall.c
562+
$CXX -c `pwd`/tests/integration/test_clang_multicall.c
563563
564564
- name: Output
565565
run: |
@@ -568,7 +568,7 @@ jobs:
568568
- name: Test Twice for Cache Read
569569
run: |
570570
export CXX="${SCCACHE_PATH} clang++"
571-
$CXX -c `pwd`/tests/test_clang_multicall.c
571+
$CXX -c `pwd`/tests/integration/test_clang_multicall.c
572572
573573
- name: Output
574574
run: |
@@ -579,12 +579,12 @@ jobs:
579579
- name: Test ASM
580580
run: |
581581
export ASM="${SCCACHE_PATH} clang"
582-
$ASM -c `pwd`/tests/test_intel_asm.s
582+
$ASM -c `pwd`/tests/integration/test_intel_asm.s
583583
584584
- name: Test ASM with preprocessor
585585
run: |
586586
export ASM="${SCCACHE_PATH} clang"
587-
$ASM -c `pwd`/tests/test_intel_asm_to_preproc.S
587+
$ASM -c `pwd`/tests/integration/test_intel_asm_to_preproc.S
588588
589589
hip:
590590
# Probably wouldn't matter anyway since we run in a container, but staying
@@ -648,13 +648,13 @@ jobs:
648648
- name: Sanity Check
649649
run: |
650650
export LD_PRELOAD=$PWD/target/debug/librandomize_readdir.so
651-
hipcc -o vectoradd_hip --offload-arch=gfx900 tests/cmake-hip/vectoradd_hip.cpp
651+
hipcc -o vectoradd_hip --offload-arch=gfx900 tests/integration/cmake-hip/vectoradd_hip.cpp
652652
653653
- name: Test
654654
run: |
655655
export LD_PRELOAD=$PWD/target/debug/librandomize_readdir.so
656656
rm "$RANDOMIZE_READDIR_LOG".*
657-
cmake -B build -S tests/cmake-hip -DCMAKE_HIP_COMPILER_LAUNCHER=${SCCACHE_PATH} -DCMAKE_HIP_ARCHITECTURES=gfx900
657+
cmake -B build -S tests/integration/cmake-hip -DCMAKE_HIP_COMPILER_LAUNCHER=${SCCACHE_PATH} -DCMAKE_HIP_ARCHITECTURES=gfx900
658658
cmake --build build
659659
if ! grep -q bitcode "$RANDOMIZE_READDIR_LOG".*; then
660660
echo "amdgcn bitcode not accessed, is librandomize_readdir properly set up?"
@@ -671,7 +671,7 @@ jobs:
671671
export LD_PRELOAD=$PWD/target/debug/librandomize_readdir.so
672672
rm "$RANDOMIZE_READDIR_LOG".*
673673
rm -rf build
674-
cmake -B build -S tests/cmake-hip -DCMAKE_HIP_COMPILER_LAUNCHER=${SCCACHE_PATH} -DCMAKE_HIP_ARCHITECTURES=gfx900
674+
cmake -B build -S tests/integration/cmake-hip -DCMAKE_HIP_COMPILER_LAUNCHER=${SCCACHE_PATH} -DCMAKE_HIP_ARCHITECTURES=gfx900
675675
cmake --build build
676676
if ! grep -q bitcode "$RANDOMIZE_READDIR_LOG".*; then
677677
echo "amdgcn bitcode not accessed, is librandomize_readdir properly set up?"
@@ -712,7 +712,7 @@ jobs:
712712
- name: Test C/C++
713713
run: |
714714
export CXX="${SCCACHE_PATH} g++"
715-
$CXX -c `pwd`/tests/test_clang_multicall.c
715+
$CXX -c `pwd`/tests/integration/test_clang_multicall.c
716716
717717
- name: Output
718718
run: |
@@ -721,7 +721,7 @@ jobs:
721721
- name: Test Twice for Cache Read
722722
run: |
723723
export CXX="${SCCACHE_PATH} g++"
724-
$CXX -c `pwd`/tests/test_clang_multicall.c
724+
$CXX -c `pwd`/tests/integration/test_clang_multicall.c
725725
726726
- name: Output
727727
run: |
@@ -732,12 +732,12 @@ jobs:
732732
- name: Test ASM
733733
run: |
734734
export ASM="${SCCACHE_PATH} gcc"
735-
$ASM -c `pwd`/tests/test_intel_asm.s
735+
$ASM -c `pwd`/tests/integration/test_intel_asm.s
736736
737737
- name: Test ASM with preprocessor
738738
run: |
739739
export ASM="${SCCACHE_PATH} gcc"
740-
$ASM -c `pwd`/tests/test_intel_asm_to_preproc.S
740+
$ASM -c `pwd`/tests/integration/test_intel_asm_to_preproc.S
741741
742742
autotools:
743743
runs-on: ubuntu-24.04
@@ -772,7 +772,7 @@ jobs:
772772
773773
- name: Test
774774
run: |
775-
cd `pwd`/tests/autotools/
775+
cd `pwd`/tests/integration/autotools/
776776
autoreconf||true
777777
automake --add-missing
778778
./configure CXX="${SCCACHE_PATH} g++"
@@ -784,7 +784,7 @@ jobs:
784784
785785
- name: Test Twice for Cache Read
786786
run: |
787-
cd `pwd`/tests/autotools/
787+
cd `pwd`/tests/integration/autotools/
788788
make distclean
789789
./configure CXX="${SCCACHE_PATH} g++"
790790
make
@@ -828,7 +828,7 @@ jobs:
828828
829829
- name: Test
830830
run: |
831-
cd `pwd`/tests/cmake/
831+
cd `pwd`/tests/integration/cmake/
832832
mkdir build
833833
cd build
834834
cmake -DCMAKE_C_COMPILER_LAUNCHER=${SCCACHE_PATH} -DCMAKE_CXX_COMPILER_LAUNCHER=${SCCACHE_PATH} ..
@@ -840,7 +840,7 @@ jobs:
840840
841841
- name: Test Twice for Cache Read
842842
run: |
843-
cd `pwd`/tests/cmake/
843+
cd `pwd`/tests/integration/cmake/
844844
rm -rf build
845845
mkdir build
846846
cd build
@@ -968,7 +968,7 @@ jobs:
968968
run: ${SCCACHE_PATH} --start-server
969969

970970
- name: Test compile xcode
971-
working-directory: tests/xcode
971+
working-directory: tests/integration/xcode
972972
run: |
973973
xcodebuild -version
974974
xcodebuild -xcconfig sccache.xcconfig
@@ -978,7 +978,7 @@ jobs:
978978
${SCCACHE_PATH} --show-stats
979979
980980
- name: Test compile xcode cached
981-
working-directory: tests/xcode
981+
working-directory: tests/integration/xcode
982982
run: |
983983
xcodebuild clean
984984
xcodebuild -xcconfig sccache.xcconfig

tests/autotools/Makefile.am renamed to tests/integration/autotools/Makefile.am

File renamed without changes.

tests/autotools/configure.ac renamed to tests/integration/autotools/configure.ac

File renamed without changes.

tests/autotools/main.cpp renamed to tests/integration/autotools/main.cpp

File renamed without changes.

tests/cmake-hip/CMakeLists.txt renamed to tests/integration/cmake-hip/CMakeLists.txt

File renamed without changes.

tests/cmake-hip/vectoradd_hip.cpp renamed to tests/integration/cmake-hip/vectoradd_hip.cpp

File renamed without changes.

tests/cmake/CMakeLists.txt renamed to tests/integration/cmake/CMakeLists.txt

File renamed without changes.

tests/cmake/main.cpp renamed to tests/integration/cmake/main.cpp

File renamed without changes.

tests/htpasswd renamed to tests/integration/htpasswd

File renamed without changes.

tests/msvc-preprocessing/args.rsp renamed to tests/integration/msvc-preprocessing/args.rsp

File renamed without changes.

0 commit comments

Comments
 (0)