diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 18f7073b16..5b65d89850 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -40,7 +40,7 @@ jobs: run: echo "DAT3M_OUTPUT=$(echo $DAT3M_HOME)/output" >> $GITHUB_ENV - name: Litmus tests - run: mvn test -Dtest="com/dat3m/dartagnan/litmus/*" + run: mvn test -Dtest="com/dat3m/dartagnan/litmus/**/*" llvm-tests: name: LLVM tests @@ -63,7 +63,7 @@ jobs: run: echo "DAT3M_OUTPUT=$(echo $DAT3M_HOME)/output" >> $GITHUB_ENV - name: LLVM tests - run: mvn test -Dtest="com/dat3m/dartagnan/llvm/*" + run: mvn test -Dtest="com/dat3m/dartagnan/llvm/**/*" other-tests: name: Other tests @@ -86,7 +86,7 @@ jobs: run: echo "DAT3M_OUTPUT=$(echo $DAT3M_HOME)/output" >> $GITHUB_ENV - name: Other tests - run: mvn test -Dtest="com/dat3m/dartagnan/others/*" + run: mvn test -Dtest="com/dat3m/dartagnan/others/**/*" spirv-tests: name: SPIRV tests @@ -109,7 +109,7 @@ jobs: run: echo "DAT3M_OUTPUT=$(echo $DAT3M_HOME)/output" >> $GITHUB_ENV - name: SPIRV tests - run: mvn test -Dtest="com/dat3m/dartagnan/spirv/*" + run: mvn test -Dtest="com/dat3m/dartagnan/spirv/**/*" weekly: name: All tests diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/AbstractCTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/AbstractCTest.java index 6279a4c64a..d2587eed06 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/AbstractCTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/AbstractCTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.configuration.OptionNames; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/C11LFDSTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/C11LFDSTest.java index 4f7bd8c601..6271897c41 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/C11LFDSTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/C11LFDSTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.configuration.OptionNames; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/C11LocksTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/C11LocksTest.java index 32006ed96e..4983fcf9bd 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/C11LocksTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/C11LocksTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.configuration.OptionNames; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/C11OrigLFDSTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/C11OrigLFDSTest.java index 513da1402b..ee65e9d971 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/C11OrigLFDSTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/C11OrigLFDSTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.utils.Result; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/C11OrigLocksTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/C11OrigLocksTest.java index da84efd8e7..2ac2f52afc 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/C11OrigLocksTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/C11OrigLocksTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.utils.Result; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/CLKMMTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/CLKMMTest.java index 2ecd788f51..d8e13ea3bf 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/CLKMMTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/CLKMMTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.utils.Result; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/CLocksTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/CLocksTest.java index f7fc6f604e..c39d499c4d 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/CLocksTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/CLocksTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.utils.Result; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/CProgressTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/CProgressTest.java index 4744418956..f62aba8aaa 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/CProgressTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/CProgressTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.ProgressModel; import com.dat3m.dartagnan.configuration.Property; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/EBRTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/EBRTest.java index f47e231518..84df7938fc 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/EBRTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/EBRTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.utils.Result; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/IMMLFDSTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/IMMLFDSTest.java index c2afbe6bde..edf178409d 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/IMMLFDSTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/IMMLFDSTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.utils.Result; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/IMMLocksTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/IMMLocksTest.java index 9b2ee9649f..8349dfdf71 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/IMMLocksTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/IMMLocksTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.utils.Result; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/IMMTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/IMMTest.java index 7e97a31209..5643a6e106 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/IMMTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/IMMTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.utils.Result; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/LFDSTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/LFDSTest.java index 1c8a230bad..0253da9f47 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/LFDSTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/LFDSTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.utils.Result; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/LibvsyncTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/LibvsyncTest.java index e0a40f26ff..5af20c9f77 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/LibvsyncTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/LibvsyncTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.configuration.Property; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/LivenessTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/LivenessTest.java index db0f76a0d9..a657f6a41d 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/LivenessTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/LivenessTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.configuration.Property; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/MiscellaneousTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/MiscellaneousTest.java index 2e52c835c0..ef2776bb9a 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/MiscellaneousTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/MiscellaneousTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.configuration.OptionNames; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/RC11LFDSTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/RC11LFDSTest.java index fe2bef3a29..6c77b426f3 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/RC11LFDSTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/RC11LFDSTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.utils.Result; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/RC11LocksTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/RC11LocksTest.java index 98ae7fea8e..9111042b43 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/RC11LocksTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/RC11LocksTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.utils.Result; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/RC11Test.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/RC11Test.java index dc55d46afc..f19bcccb28 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/RC11Test.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/RC11Test.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.utils.Result; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/VMMLFDSTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/VMMLFDSTest.java index 9566fa7bde..3665871654 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/VMMLFDSTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/VMMLFDSTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.configuration.Property; diff --git a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/VMMLocksTest.java b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/VMMLocksTest.java index ce9682ba6c..d8e29f1408 100644 --- a/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/VMMLocksTest.java +++ b/dartagnan/src/test/java/com/dat3m/dartagnan/llvm/VMMLocksTest.java @@ -1,4 +1,4 @@ -package com.dat3m.dartagnan.c; +package com.dat3m.dartagnan.llvm; import com.dat3m.dartagnan.configuration.Arch; import com.dat3m.dartagnan.configuration.Property;