Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 0 additions & 82 deletions .github/dlsmt.sh

This file was deleted.

25 changes: 15 additions & 10 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,18 @@ jobs:
GH_TOKEN: ${{ github.token }}
steps:
- uses: actions/checkout@v4

- name: Setup SMT solvers
uses: keyproject/setup-smt@v0
# with:
# z3Version: 4.13.0

- name: z3 version
run: z3 --version

- name: cvc5 version
run: cvc5 --version

- name: Set up JDK 21
uses: actions/setup-java@v4
with:
Expand All @@ -39,6 +51,7 @@ jobs:

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Test with Gradle
run: ./gradlew --continue -DjacocoEnabled=true -x :key.core.symbolic_execution:test -x :key.core.proof_references:test test

Expand Down Expand Up @@ -75,16 +88,8 @@ jobs:
distribution: 'corretto'
cache: 'gradle'

- name: Cache SMT-Solvers
id: smt-solvers
uses: actions/cache@v4
with:
path: smt-solvers
key: ${{ runner.os }}-smt-solvers

- name: Install SMT-Solvers
run: .github/dlsmt.sh
shell: bash
- name: Setup SMT solvers
uses: keyproject/setup-smt@v0

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
Expand Down
33 changes: 19 additions & 14 deletions .github/workflows/tests_winmac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,24 @@ jobs:
fail-fast: false
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
java: [17,21]
java: [21,23]
continue-on-error: true
runs-on: ${{ matrix.os }}
env:
GH_TOKEN: ${{ github.token }}
steps:
- uses: actions/checkout@v4

- name: Setup SMT solvers
uses: keyproject/setup-smt@v0

- name: z3 version
run: z3 --version

- name: cvc5 version
run: cvc5 --version


- name: Set up JDK ${{matrix.java}}
uses: actions/setup-java@v4
with:
Expand All @@ -38,7 +49,7 @@ jobs:
uses: actions/upload-artifact@v4
if: success() || failure()
with:
name: test-results-${{ matrix.os }}
name: unit-test-results-${{matrix.test}}-${{ matrix.os }}-${{ matrix.java }}
path: |
**/build/test-results/*/*.xml
**/build/reports/
Expand All @@ -58,33 +69,27 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4

- name: Setup SMT solvers
uses: keyproject/setup-smt@v0

- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'corretto'
cache: 'gradle'

- name: Cache SMT-Solvers
id: smt-solvers
uses: actions/cache@v4
with:
path: smt-solvers
key: ${{ runner.os }}-smt-solvers

- name: Install SMT-Solvers
run: .github/dlsmt.sh

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
- name: "Running tests: ${{ matrix.test }}"
run: ./gradlew --continue ${{ matrix.test }}

- name: Upload test results
uses: actions/upload-artifact@v4
if: success() || failure() # run this step even if previous step failed
if: success() || failure() # run this step even if a previous step failed
with:
name: test-results-${{ matrix.os }}
name: integration-test-results-${{matrix.test}}-${{ matrix.os }}-${{ matrix.java }}
path: |
**/build/test-results/*/*.xml
key.core/build/reports/runallproofs/*
Expand Down
3 changes: 3 additions & 0 deletions key.core/src/test/java/de/uka/ilkd/key/smt/test/TestZ3.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import de.uka.ilkd.key.smt.solvertypes.SolverTypeImplementation;
import de.uka.ilkd.key.smt.solvertypes.SolverTypes;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -76,11 +77,13 @@ public void testDiv3() throws Exception {
}

@Test
@Disabled("weigl: due to performance issues")
public void testDiv5() throws Exception {
assertTrue(correctResult(testFile + "div5.key", false));
}

@Test
@Disabled("weigl: due to performance issues")
public void testDiv6() throws Exception {
assertTrue(correctResult(testFile + "div6.key", false));
}
Expand Down
Loading