Skip to content

Commit b0e48e4

Browse files
authored
Trim source paths in regression tests (#2588)
1 parent 486dfd5 commit b0e48e4

21 files changed

+34666
-34657
lines changed

scripts/generate-regression-tests.sh

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ generate-evm() {
3636
kevm run --backend haskell \
3737
--mode VMTESTS --schedule DEFAULT \
3838
tests/ethereum-tests/VMTests/vmIOandFlowOperations/pop1.json
39-
39+
4040
kollect test-add0 env \
4141
kevm run --backend haskell \
4242
--mode VMTESTS --schedule DEFAULT \
4343
tests/ethereum-tests/VMTests/vmArithmeticTest/add0.json \
44-
44+
4545
kollect test-sumTo10 \
4646
kevm run --backend haskell \
4747
--mode VMTESTS --schedule DEFAULT \
4848
tests/interactive/sumTo10.evm \
49-
49+
5050
for search in \
5151
branching-no-invalid straight-line-no-invalid \
5252
branching-invalid straight-line
@@ -56,11 +56,13 @@ generate-evm() {
5656
"tests/interactive/search/$search.evm" \
5757
"<statusCode> EVMC_INVALID_INSTRUCTION </statusCode>"
5858
done
59-
59+
6060
kollect test-sum-to-n \
6161
kevm prove --backend haskell \
6262
tests/specs/examples/sum-to-n-spec.k \
6363
VERIFICATION --format-failures
64+
65+
$KORE/scripts/trim-source-paths.sh *.kore
6466
}
6567

6668
generate-wasm() {
@@ -76,16 +78,18 @@ generate-wasm() {
7678
tests/proofs/"$spec"-spec.k \
7779
KWASM-LEMMAS
7880
done
79-
81+
8082
kollect "test-memory" \
8183
./kwasm prove --backend haskell \
8284
tests/proofs/memory-spec.k \
8385
KWASM-LEMMAS \
8486
--concrete-rules WASM-DATA.wrap-Positive,WASM-DATA.setRange-Positive,WASM-DATA.getRange-Positive
85-
87+
8688
kollect "test-wrc20" \
8789
./kwasm prove --backend haskell tests/proofs/wrc20-spec.k WRC20-LEMMAS --format-failures \
8890
--concrete-rules WASM-DATA.wrap-Positive,WASM-DATA.setRange-Positive,WASM-DATA.getRange-Positive,WASM-DATA.get-Existing,WASM-DATA.set-Extend
91+
92+
$KORE/scripts/trim-source-paths.sh *.kore
8993
}
9094

9195
replace-tests() {

scripts/trim-source-paths.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
3+
sed \
4+
-e 's|/home/jenkins-slave/workspace/[^/]\+/||' \
5+
-i "$@"

test/regression-evm/test-add0-definition.kore

Lines changed: 3310 additions & 3310 deletions
Large diffs are not rendered by default.

test/regression-evm/test-branching-invalid-definition.kore

Lines changed: 3310 additions & 3310 deletions
Large diffs are not rendered by default.

test/regression-evm/test-branching-no-invalid-definition.kore

Lines changed: 3310 additions & 3310 deletions
Large diffs are not rendered by default.

test/regression-evm/test-pop1-definition.kore

Lines changed: 3310 additions & 3310 deletions
Large diffs are not rendered by default.

test/regression-evm/test-straight-line-definition.kore

Lines changed: 3310 additions & 3310 deletions
Large diffs are not rendered by default.

test/regression-evm/test-straight-line-no-invalid-definition.kore

Lines changed: 3310 additions & 3310 deletions
Large diffs are not rendered by default.

test/regression-evm/test-sum-to-n-spec.kore

Lines changed: 5 additions & 5 deletions
Large diffs are not rendered by default.

test/regression-evm/test-sum-to-n-vdefinition.kore

Lines changed: 3270 additions & 3270 deletions
Large diffs are not rendered by default.

test/regression-evm/test-sumTo10-definition.kore

Lines changed: 3310 additions & 3310 deletions
Large diffs are not rendered by default.

test/regression-wasm/test-locals-spec.kore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import KWASM-LEMMAS []
66

77

88
// claims
9-
// claim `<generatedTop>`(`<wasm>`(`<instrs>`(inj{Instr,KItem}(`aLocal.get`(X))~>inj{Instr,KItem}(`aLocal.set`(X))~>_DotVar2),_0,`<curFrame>`(`<locals>`(`_|->_`(inj{Int,KItem}(X),inj{Val,KItem}(`<_>__WASM-DATA_Val_ValType_Number`(_ITYPE,VAL)))),_DotVar3),_1,_2,_3,_4,_5,_6),_DotVar0)=>`<generatedTop>`(`<wasm>`(`<instrs>`(_DotVar2),_0,`<curFrame>`(`<locals>`(`_|->_`(inj{Int,KItem}(X),inj{Val,KItem}(`<_>__WASM-DATA_Val_ValType_Number`(_ITYPE,VAL)))),_DotVar3),_1,_2,_3,_4,_5,_6),_DotVar0) requires #token("true","Bool") ensures #token("true","Bool") [contentStartColumn(11), contentStartLine(6), org.kframework.attributes.Location(Location(6,11,9,20)), org.kframework.attributes.Source(Source(/home/jenkins-slave/workspace/haskell-backend_PR-2548/wasm-semantics/././tests/proofs/locals-spec.k)), org.kframework.definition.Production(syntax #RuleContent ::= #RuleBody [klabel(#ruleNoConditions), symbol])]
9+
// claim `<generatedTop>`(`<wasm>`(`<instrs>`(inj{Instr,KItem}(`aLocal.get`(X))~>inj{Instr,KItem}(`aLocal.set`(X))~>_DotVar2),_0,`<curFrame>`(`<locals>`(`_|->_`(inj{Int,KItem}(X),inj{Val,KItem}(`<_>__WASM-DATA_Val_ValType_Number`(_ITYPE,VAL)))),_DotVar3),_1,_2,_3,_4,_5,_6),_DotVar0)=>`<generatedTop>`(`<wasm>`(`<instrs>`(_DotVar2),_0,`<curFrame>`(`<locals>`(`_|->_`(inj{Int,KItem}(X),inj{Val,KItem}(`<_>__WASM-DATA_Val_ValType_Number`(_ITYPE,VAL)))),_DotVar3),_1,_2,_3,_4,_5,_6),_DotVar0) requires #token("true","Bool") ensures #token("true","Bool") [contentStartColumn(11), contentStartLine(6), org.kframework.attributes.Location(Location(6,11,9,20)), org.kframework.attributes.Source(Source(wasm-semantics/././tests/proofs/locals-spec.k)), org.kframework.definition.Production(syntax #RuleContent ::= #RuleBody [klabel(#ruleNoConditions), symbol])]
1010
claim{} \implies{SortGeneratedTopCell{}} (
1111
\and{SortGeneratedTopCell{}} (
1212
\top{SortGeneratedTopCell{}}(), Lbl'-LT-'generatedTop'-GT-'{}(Lbl'-LT-'wasm'-GT-'{}(Lbl'-LT-'instrs'-GT-'{}(kseq{}(inj{SortInstr{}, SortKItem{}}(LblaLocal'Stop'get{}(VarX:SortInt{})),kseq{}(inj{SortInstr{}, SortKItem{}}(LblaLocal'Stop'set{}(VarX:SortInt{})),Var'Unds'DotVar2:SortK{}))),Var'Unds'0:SortValstackCell{},Lbl'-LT-'curFrame'-GT-'{}(Lbl'-LT-'locals'-GT-'{}(Lbl'UndsPipe'-'-GT-Unds'{}(inj{SortInt{}, SortKItem{}}(VarX:SortInt{}),inj{SortVal{}, SortKItem{}}(Lbl'-LT-Unds-GT-UndsUnds'WASM-DATA'Unds'Val'Unds'ValType'Unds'Number{}(Var'Unds'ITYPE:SortValType{},VarVAL:SortNumber{})))),Var'Unds'DotVar3:SortCurModIdxCell{}),Var'Unds'1:SortModuleRegistryCell{},Var'Unds'2:SortModuleIdsCell{},Var'Unds'3:SortModuleInstancesCell{},Var'Unds'4:SortNextModuleIdxCell{},Var'Unds'5:SortMainStoreCell{},Var'Unds'6:SortDeterministicMemoryGrowthCell{}),Var'Unds'DotVar0:SortGeneratedCounterCell{})), weakAlwaysFinally{SortGeneratedTopCell{}} (
1313
\and{SortGeneratedTopCell{}} (
1414
\top{SortGeneratedTopCell{}}(), Lbl'-LT-'generatedTop'-GT-'{}(Lbl'-LT-'wasm'-GT-'{}(Lbl'-LT-'instrs'-GT-'{}(Var'Unds'DotVar2:SortK{}),Var'Unds'0:SortValstackCell{},Lbl'-LT-'curFrame'-GT-'{}(Lbl'-LT-'locals'-GT-'{}(Lbl'UndsPipe'-'-GT-Unds'{}(inj{SortInt{}, SortKItem{}}(VarX:SortInt{}),inj{SortVal{}, SortKItem{}}(Lbl'-LT-Unds-GT-UndsUnds'WASM-DATA'Unds'Val'Unds'ValType'Unds'Number{}(Var'Unds'ITYPE:SortValType{},VarVAL:SortNumber{})))),Var'Unds'DotVar3:SortCurModIdxCell{}),Var'Unds'1:SortModuleRegistryCell{},Var'Unds'2:SortModuleIdsCell{},Var'Unds'3:SortModuleInstancesCell{},Var'Unds'4:SortNextModuleIdxCell{},Var'Unds'5:SortMainStoreCell{},Var'Unds'6:SortDeterministicMemoryGrowthCell{}),Var'Unds'DotVar0:SortGeneratedCounterCell{}))))
15-
[org'Stop'kframework'Stop'attributes'Stop'Source{}("Source(/home/jenkins-slave/workspace/haskell-backend_PR-2548/wasm-semantics/././tests/proofs/locals-spec.k)"), org'Stop'kframework'Stop'definition'Stop'Production{}(), contentStartLine{}(), contentStartColumn{}(), org'Stop'kframework'Stop'attributes'Stop'Location{}("Location(6,11,9,20)")]
15+
[org'Stop'kframework'Stop'attributes'Stop'Source{}("Source(wasm-semantics/././tests/proofs/locals-spec.k)"), org'Stop'kframework'Stop'definition'Stop'Production{}(), contentStartLine{}(), contentStartColumn{}(), org'Stop'kframework'Stop'attributes'Stop'Location{}("Location(6,11,9,20)")]
1616

17-
endmodule [org'Stop'kframework'Stop'attributes'Stop'Location{}("Location(3,1,10,9)"), org'Stop'kframework'Stop'attributes'Stop'Source{}("Source(/home/jenkins-slave/workspace/haskell-backend_PR-2548/wasm-semantics/././tests/proofs/locals-spec.k)")]
17+
endmodule [org'Stop'kframework'Stop'attributes'Stop'Location{}("Location(3,1,10,9)"), org'Stop'kframework'Stop'attributes'Stop'Source{}("Source(wasm-semantics/././tests/proofs/locals-spec.k)")]

0 commit comments

Comments
 (0)