Skip to content

Commit db47f4f

Browse files
committed
[GHA] Allow setting a specific test expectations file
- SOM-RS shouldn’t need custom test command anymore - JAVA_HOME for TruffleSOM should already be set by the build step Signed-off-by: Stefan Marr <[email protected]>
1 parent 4a7052e commit db47f4f

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ jobs:
7979
./som --setup labsjdk
8080
mx build
8181
82-
som: "JAVA_HOME=$JAVA_HOME_17_X64 ./som -G"
82+
som: ./som -G
83+
test-expectations: integration-tests-ast.yml
8384
not-up-to-date: false
8485

8586
- name: Specification Tests
@@ -90,7 +91,6 @@ jobs:
9091
repo: som-rs.git
9192
build: "cargo build --release -p som-interpreter-bc"
9293
som: "./target/release/som-interpreter-bc"
93-
som-tests: " -c ../Smalltalk ../TestSuite -- TestHarness"
9494
not-up-to-date: false
9595

9696
# - name: ykSOM
@@ -173,14 +173,17 @@ jobs:
173173
cd som-vm
174174
git --no-pager log -n 1
175175
176-
echo Build ${{ matrix.repo }}
177-
${{ matrix.build }}
176+
if [ ! -z "${{ matrix.build }}" ]
177+
then
178+
echo Build ${{ matrix.repo }}
179+
${{ matrix.build }}
180+
fi
178181
179182
- name: Run Tests on SOM VM
180183
if: ${{ matrix.som != 'spec' }}
181184
run: |
182185
cd som-vm
183-
if [ "${{ matrix.som-tests }}" == "" ]
186+
if [ -z "${{ matrix.som-tests }}" ]
184187
then
185188
# The default settings for running the test harness, supported by most SOM VMs
186189
export SOM_TESTS="-cp ../Smalltalk ../TestSuite/TestHarness.som"
@@ -198,7 +201,13 @@ jobs:
198201
pip install pytest
199202
export VM="som-vm/${{ matrix.som }}"
200203
export CLASSPATH=Smalltalk
201-
export TEST_EXPECTATIONS=som-vm/integration-tests.yml
204+
205+
if [ -z "${{ matrix.test-expectations }}" ]; then
206+
export TEST_EXPECTATIONS=som-vm/integration-tests.yml
207+
else
208+
export TEST_EXPECTATIONS=som-vm/${{ matrix.test-expectations }}
209+
fi
210+
202211
export AWFY=Examples/AreWeFastYet/Core
203212
pytest IntegrationTests
204213

0 commit comments

Comments
 (0)