Skip to content

Commit

Permalink
Merge branch 'main' into cleanup-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
fzaiser committed Sep 26, 2023
2 parents be303a2 + f13b204 commit f744c9c
Show file tree
Hide file tree
Showing 12 changed files with 75 additions and 51 deletions.
15 changes: 0 additions & 15 deletions .github/workflows/test.yml

This file was deleted.

14 changes: 14 additions & 0 deletions .github/workflows/test_cs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: 'Run C# tests'
on:
workflow_dispatch:
pull_request:
push:
branches:
- 'main'
jobs:
all:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: bash scripts/prep.sh
- run: DAFNY=dafny/dafny LANG=cs bash scripts/test.sh
14 changes: 14 additions & 0 deletions .github/workflows/test_java.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: 'Run Java tests'
on:
workflow_dispatch:
pull_request:
push:
branches:
- 'main'
jobs:
all:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: bash scripts/prep.sh
- run: DAFNY=dafny/dafny LANG=java bash scripts/test.sh
5 changes: 2 additions & 3 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: wget https://github.com/dafny-lang/dafny/releases/download/v4.2.0/dafny-4.2.0-x64-ubuntu-20.04.zip
- run: unzip dafny-4.2.0-x64-ubuntu-20.04.zip
- run: DAFNY=dafny/dafny bash verify.sh
- run: bash scripts/prep.sh
- run: DAFNY=dafny/dafny bash scripts/verify.sh
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions scripts/prep.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

VERSION=https://github.com/dafny-lang/dafny/releases/download/v4.2.0/dafny-4.2.0-x64-ubuntu-20.04.zip

wget $VERSION
unzip `basename $VERSION`
39 changes: 39 additions & 0 deletions scripts/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#!/bin/bash

set -e

if [ -z ${DAFNY+x} ]
then
echo "Set the DAFNY variable"
exit 1
fi

if [ -z ${LANG+x} ]
then
echo "Set the LANG variable"
exit 1
fi

echo Running $LANG tests...
echo "Running tests/TestsFoundational.dfy:"
time $DAFNY test --target:$LANG interop/$LANG/DRandomCoin.$LANG interop/$LANG/DRandomUniform.$LANG tests/TestsFoundational.dfy
echo "Running tests/TestsExternUniform.dfy:"
time $DAFNY test --target:$LANG interop/$LANG/DRandomCoin.$LANG interop/$LANG/DRandomUniform.$LANG tests/TestsExternUniform.dfy

echo Running $LANG documentation...
echo "Running docs/ExamplesFoundational.dfy"
$DAFNY run docs/ExamplesFoundational.dfy --target:$LANG --input interop/$LANG/DRandomCoin.$LANG --input interop/$LANG/DRandomUniform.$LANG
echo "docs/ExamplesExternUniform.dfy"
$DAFNY run docs/ExamplesExternUniform.dfy --target:$LANG --input interop/$LANG/DRandomCoin.$LANG --input interop/$LANG/DRandomUniform.$LANG

# echo Running Java tests...
# echo "Running tests/TestsFoundational.dfy:"
# $DAFNY test --target:java interop/java/DRandomCoin.java interop/java/DRandomUniform.java tests/TestsFoundational.dfy
# echo "Running tests/TestsExternUniform.dfy:"
# $DAFNY test --target:java interop/java/DRandomCoin.java interop/java/DRandomUniform.java tests/TestsExternUniform.dfy

# echo Running Java documentation...
# echo "Running docs/ExamplesFoundational.dfy"
# $DAFNY run docs/ExamplesFoundational.dfy --target:java --input interop/java/DRandomCoin.java --input interop/java/DRandomUniform.java
# echo "Running tests/TestsExternUniform.dfy:"
# $DAFNY run docs/ExamplesExternUniform.dfy --target:java --input interop/java/DRandomCoin.java --input interop/java/DRandomUniform.java
File renamed without changes.
33 changes: 0 additions & 33 deletions test.sh

This file was deleted.

0 comments on commit f744c9c

Please sign in to comment.