Skip to content

Commit af9a1e2

Browse files
committed
Use Pitchfork layout
See https://github.com/vector-of-bool/pitchfork Signed-off-by: onox <denkpadje@gmail.com>
1 parent 5eebc3e commit af9a1e2

18 files changed

+30
-31
lines changed

.gitignore

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
/lib/
2-
/obj/
3-
/test/unit/obj/
4-
/test/cov/
1+
/build/
2+
/tests/unit/build/
3+
/tests/cov/
54
/bin/
65
*.swp
76
.DS_Store
87
.#*#
98
auto.cgpr
10-
/test/unit/test_bindings
9+
/tests/unit/test_bindings
1110
/TEST-*.xml

Makefile

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,37 @@ gprdir = $(PREFIX)/share/gpr
1212
libdir = $(PREFIX)/lib
1313
alidir = $(libdir)
1414

15-
.PHONY: build test debug clean coverage install
15+
.PHONY: build tests debug clean coverage install
1616

1717
build:
18-
$(GNATMAKE) -P json_ada.gpr -cargs $(CFLAGS) -largs $(LDFLAGS)
18+
$(GNATMAKE) -P tools/json_ada.gpr -cargs $(CFLAGS) -largs $(LDFLAGS)
1919

2020
build_test:
21-
$(GNATMAKE) -P test/unit/unit_tests.gpr -XMode=coverage -cargs -O0 -largs $(LDFLAGS)
21+
$(GNATMAKE) -P tests/unit/unit_tests.gpr -XMode=coverage -cargs -O0 -largs $(LDFLAGS)
2222

2323
debug:
24-
$(GNATMAKE) -P json_ada.gpr -XMode=debug -cargs $(CFLAGS) -largs $(LDFLAGS)
24+
$(GNATMAKE) -P tools/json_ada.gpr -XMode=debug -cargs $(CFLAGS) -largs $(LDFLAGS)
2525

2626
clean:
27-
$(GNATCLEAN) -P json_ada.gpr
28-
$(GNATCLEAN) -P test/unit/unit_tests.gpr
29-
rm -rf lib obj test/unit/obj test/cov
27+
$(GNATCLEAN) -P tools/json_ada.gpr
28+
$(GNATCLEAN) -P tests/unit/unit_tests.gpr
29+
rm -rf build tests/unit/build test/cov TEST-*.xml
3030

31-
test: build_test
32-
./test/unit/test_bindings
31+
tests: build_test
32+
./tests/unit/test_bindings
3333

3434
coverage:
35-
mkdir -p test/cov
36-
lcov -q -c -d test/unit/obj -o test/cov/unit.info
37-
lcov -q -r test/cov/unit.info */adainclude/* -o test/cov/unit.info
38-
lcov -q -r test/cov/unit.info */test/unit/* -o test/cov/unit.info
39-
genhtml -q --ignore-errors source -o test/cov/html test/cov/unit.info
40-
lcov -l test/cov/unit.info
35+
mkdir -p tests/cov
36+
lcov -q -c -d tests/unit/build/obj -o tests/cov/unit.info
37+
lcov -q -r tests/cov/unit.info */adainclude/* -o tests/cov/unit.info
38+
lcov -q -r tests/cov/unit.info */tests/unit/* -o tests/cov/unit.info
39+
genhtml -q --ignore-errors source -o tests/cov/html tests/cov/unit.info
40+
lcov -l tests/cov/unit.info
4141

4242
install:
43-
$(GNATINSTALL) --relocate-build-tree -p -q -f --install-name='json-ada' \
43+
$(GNATINSTALL) -p -q -f --install-name='json-ada' \
4444
--sources-subdir=$(includedir) \
4545
--project-subdir=$(gprdir) \
4646
--lib-subdir=$(libdir) \
4747
--ali-subdir=$(alidir) \
48-
--prefix=$(PREFIX) -P json_ada.gpr
48+
--prefix=$(PREFIX) -P tools/json_ada.gpr

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ $ make
113113

114114
## Tests
115115

116-
The project contains a set of unit tests. Use `make test` to build and
116+
The project contains a set of unit tests. Use `make tests` to build and
117117
run the unit tests. A coverage report can be generated with `make coverage`:
118118

119119
```
120-
$ make test
120+
$ make tests
121121
$ make coverage
122122
```
123123

shippable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ build:
77
pull: true
88
ci:
99
- apt install -y --no-install-recommends gprbuild make libahven6-dev lcov
10-
- make test
10+
- make tests
1111
- make coverage
1212
post_ci:
1313
- mkdir -p shippable/testresults
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)