Skip to content

Commit acc8d62

Browse files
committed
Get rid of Windows hacks
Fixes: #623 Fixes: #787
1 parent 11cf12d commit acc8d62

File tree

2 files changed

+4
-25
lines changed

2 files changed

+4
-25
lines changed

buildspec-windows.yml

-16
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,6 @@ phases:
3636
3737
post_build:
3838
commands:
39-
- |
40-
cd regression
41-
# HACK disable failing tests
42-
Remove-Item ansi-c\Forward_Declaration2 -Force -Recurse
43-
Remove-Item cbmc\Malloc23 -Force -Recurse
44-
Remove-Item cbmc\byte_update2 -Force -Recurse
45-
Remove-Item cbmc\byte_update3 -Force -Recurse
46-
Remove-Item cbmc\byte_update4 -Force -Recurse
47-
Remove-Item cbmc\byte_update5 -Force -Recurse
48-
Remove-Item cbmc\byte_update6 -Force -Recurse
49-
Remove-Item cbmc\byte_update7 -Force -Recurse
50-
cd ..
51-
cd jbmc/regression
52-
Remove-Item jbmc\VarLengthArrayTrace1 -Force -Recurse
53-
cd ../..
54-
5539
- |
5640
$env:Path = "C:\tools\cygwin\bin;$env:Path"
5741
cmd /c 'call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && bash -c "make -C regression test BUILD_ENV=MSVC" '

regression/Makefile

+4-9
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,16 @@ DIRS = cbmc \
2424
contracts \
2525
# Empty last line
2626

27-
# Tests under goto-gcc cannot be run on Windows, so appveyor.yml unlinks
28-
# the entire directory under Windows. This variable will contain the list
29-
# of directories that actually exist on the current platform.
30-
PLATFORM_DIRS = $(wildcard $(DIRS))
31-
3227
# Run all test directories in sequence
3328
.PHONY: test
3429
test:
35-
@for dir in $(PLATFORM_DIRS); do \
30+
@for dir in $(DIRS); do \
3631
$(MAKE) "$$dir" || exit 1; \
3732
done;
3833

3934
# Pattern to execute a single test suite directory
40-
.PHONY: $(PLATFORM_DIRS)
41-
$(PLATFORM_DIRS):
35+
.PHONY: $(DIRS)
36+
$(DIRS):
4237
@echo "Running $@..." ;
4338
$(MAKE) -C "$@" test || exit 1;
4439

@@ -54,7 +49,7 @@ test-parallel:
5449
--linebuffer \
5550
--jobs $(JOBS) \
5651
$(MAKE) "{}" \
57-
::: $(PLATFORM_DIRS)
52+
::: $(DIRS)
5853

5954

6055
.PHONY: clean

0 commit comments

Comments
 (0)