Skip to content

Commit

Permalink
Restructure tests (#388)
Browse files Browse the repository at this point in the history
Restructure test directories
Add and expand tests for ARM Cortex M4
Fix gimli example for ARM
Fix some negative tests under typing and register_allocation
Update testing scripts and configs
Fix gitlab-ci and avoid deadcode in intrinsic_cmp and intrinsic_tst
Exclude tests/success/warning and tests/success/noextract recursively
  • Loading branch information
sarranz authored Mar 14, 2023
1 parent 453b64f commit efb1f86
Show file tree
Hide file tree
Showing 393 changed files with 2,653 additions and 928 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ test-extract-to-ec:
- ocaml
script:
- nix-shell --arg inCI true $EXTRA_NIX_ARGUMENTS --run 'easycrypt why3config -why3 $WHY3_CONF'
- nix-shell --arg inCI true $EXTRA_NIX_ARGUMENTS --run 'make -C compiler CHECKCATS=extraction check'
- nix-shell --arg inCI true $EXTRA_NIX_ARGUMENTS --run 'make -C compiler CHECKCATS=x86-64-extraction check'
artifacts:
when: always
paths:
Expand Down
2 changes: 1 addition & 1 deletion compiler/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ JSJOBS ?= 2
CHECKPY ?=
CHECK := $(CHECKPY) scripts/runtest --jobs="$(JSJOBS)"
CHECK += config/tests.config
CHECKCATS ?= all safety CCT nolea print arm
CHECKCATS ?= safety CCT x86-64-ATT x86-64-Intel x86-64-print x86-64-nolea arm-m4

# --------------------------------------------------------------------
DESTDIR ?=
Expand Down
40 changes: 25 additions & 15 deletions compiler/config/tests.config
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[default]
bin = ./scripts/compile-and-assemble

[test-nolea]
[test-x86-64-nolea]
bin = ./scripts/check-x86-64
args = -nolea
kodirs = tests/fail/nolea
kodirs = tests/fail/nolea/x86-64

[test-safety]
bin = ./scripts/check-safety
Expand All @@ -15,20 +15,30 @@ bin = ./scripts/check-cct
okdirs = !CCT/success
kodirs = !CCT/fail

[test-all]
okdirs = !examples !tests/success
kodirs = tests/fail tests/fail/annotation
exclude = examples/arm_m4
[test-x86-64-ATT]
bin = ./scripts/check-x86-64
args = -ATT
okdirs = examples/**/x86-64 tests/success/**/x86-64
kodirs = tests/fail/**/x86-64
exclude = !tests/fail/warning

[test-print]
[test-x86-64-Intel]
bin = ./scripts/check-x86-64
args = -intel
okdirs = examples/**/x86-64 tests/success/**/x86-64
kodirs = tests/fail/**/x86-64
exclude = !tests/fail/warning

[test-x86-64-print]
bin = ./scripts/parse-print-parse
okdirs = tests/success
okdirs = tests/success/x86-64

[test-extraction]
[test-x86-64-extraction]
bin = ./scripts/extract-and-check
okdirs = !examples !tests/success
exclude = tests/success/noextract examples/arm_m4
okdirs = examples/**/x86-64 tests/success/**/x86-64
exclude = !tests/success/noextract

[test-arm]
bin = ./scripts/check-arm
okdirs = examples/arm_m4
[test-arm-m4]
bin = ./scripts/check-arm-m4
okdirs = examples/**/arm-m4 tests/success/**/arm-m4
kodirs = tests/fail/**/arm-m4
49 changes: 0 additions & 49 deletions compiler/examples/arm_m4/add.jazz

This file was deleted.

49 changes: 0 additions & 49 deletions compiler/examples/arm_m4/and.jazz

This file was deleted.

37 changes: 0 additions & 37 deletions compiler/examples/arm_m4/asr.jazz

This file was deleted.

49 changes: 0 additions & 49 deletions compiler/examples/arm_m4/eor.jazz

This file was deleted.

52 changes: 0 additions & 52 deletions compiler/examples/arm_m4/intrinsic_add.jazz

This file was deleted.

53 changes: 0 additions & 53 deletions compiler/examples/arm_m4/intrinsic_and.jazz

This file was deleted.

Loading

0 comments on commit efb1f86

Please sign in to comment.