Skip to content

Commit dc8403e

Browse files
authored
removes the testsuite submodule (#1218)
The main reason is that opam recursively initializes submodules when it installs bap from sources and given that our testsuite has a few binaries along with the traces it sums up to 5Gb of space, which leads to the out-of-disk-space errors when we build from docker. The easiest solution would be to remove testsuite from the main repo. Moreover, having it as a submodule doesn't really help and is mostly a nuisance. The proposed solution is to just clone the testsuite (potentially we can select a branch or a commit) in the test scripts. This is basically the same as what is git doing for submodules but now it will be under our control.
1 parent 168ca30 commit dc8403e

File tree

8 files changed

+6
-14
lines changed

8 files changed

+6
-14
lines changed

.github/workflows/build-and-test.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ jobs:
1515
steps:
1616
- name: Checkout code
1717
uses: actions/checkout@v2
18-
with:
19-
submodules: recursive
2018

2119
- name: Install OCaml
2220
uses: avsm/setup-ocaml@v1

.github/workflows/build-dev-repo.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ jobs:
2727
steps:
2828
- name: Checkout code
2929
uses: actions/checkout@v2
30-
with:
31-
submodules: recursive
3230

3331
- name: Use OCaml ${{ matrix.ocaml-version }}
3432
uses: avsm/setup-ocaml@v1

.github/workflows/nightly-testing.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050
- name: Checkout the Tests
5151
uses: actions/checkout@v2
5252
with:
53-
submodules: true
5453
repository: BinaryAnalysisPlatform/bap
5554

5655
- name: Install Extra System Dependencies

.github/workflows/weekly-regress.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
- name: Checkout the Tests
4040
uses: actions/checkout@v2
4141
with:
42-
submodules: true
4342
repository: BinaryAnalysisPlatform/bap
4443
ref: v2.1.0
4544

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,4 @@ _oasis
7575
bap_main_config.ml
7676
tools/postinstall.ml
7777
OMakefile
78+
/testsuite/

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "testsuite"]
2-
path = testsuite
3-
url = https://github.com/BinaryAnalysisPlatform/bap-testsuite

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@ distclean:
5151
test: build
5252
$(SETUP) -test $(BAPTESTFLAGS)
5353

54-
check:
55-
if [ -d .git ]; then git submodule init; git submodule update; fi
54+
testsuite:
55+
git clone https://github.com/BinaryAnalysisPlatform/bap-testsuite.git testsuite
56+
57+
check: testsuite
5658
make -C testsuite
5759

58-
veri:
59-
if [ -d .git ]; then git submodule init; git submodule update; fi
60+
veri: testsuite
6061
make -C testsuite veri
6162

6263
.PHONY: indent check-style status-clean

testsuite

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)