Skip to content

Commit 8c8e679

Browse files
committed
drop extra unit-test invocations
This happens in the normal test suite now.
1 parent 3174fa0 commit 8c8e679

File tree

3 files changed

+2
-15
lines changed

3 files changed

+2
-15
lines changed

ci/run-test-slice.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,4 @@ group "Run tests" make --quiet -C t T="$(cd t &&
1010
tr '\n' ' ')" ||
1111
handle_failed_tests
1212

13-
# We only have one unit test at the moment, so run it in the first slice
14-
if [ "$1" == "0" ] ; then
15-
group "Run unit tests" make --quiet -C t unit-tests-test-tool
16-
fi
17-
1813
check_unignored_build_artifacts

t/Makefile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ failed:
7575

7676
prove: pre-clean $(TEST_LINT)
7777
@echo "*** prove (shell & unit tests) ***"
78-
@$(CHAINLINTSUPPRESS) TEST_OPTIONS='$(GIT_TEST_OPTS)' TEST_SHELL_PATH='$(TEST_SHELL_PATH_SQ)' $(PROVE) --exec ./run-test.sh $(GIT_PROVE_OPTS) $(T) $(UNIT_TESTS)
78+
@$(CHAINLINTSUPPRESS) $(PROVE) --exec '$(TEST_SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS)
7979
$(MAKE) clean-except-prove-cache
8080

8181
$(T):
@@ -84,21 +84,14 @@ $(T):
8484
$(UNIT_TESTS):
8585
@echo "*** $@ ***"; $@
8686

87-
.PHONY: unit-tests unit-tests-raw unit-tests-prove unit-tests-test-tool
87+
.PHONY: unit-tests unit-tests-raw unit-tests-prove
8888
unit-tests: $(DEFAULT_UNIT_TEST_TARGET)
8989

9090
unit-tests-raw: $(UNIT_TESTS)
9191

9292
unit-tests-prove:
9393
@echo "*** prove - unit tests ***"; $(PROVE) $(GIT_PROVE_OPTS) $(UNIT_TESTS)
9494

95-
unit-tests-test-tool:
96-
@echo "*** test-tool - unit tests **"
97-
( \
98-
cd unit-tests/bin && \
99-
../../helper/test-tool$X run-command testsuite $(UNIT_TESTS_NO_DIR)\
100-
)
101-
10295
pre-clean:
10396
$(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)'
10497

t/meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ clar_unit_tests = executable('unit-tests',
6666
],
6767
dependencies: [libgit_commonmain],
6868
)
69-
test('unit-tests', clar_unit_tests, kwargs: test_kwargs)
7069

7170
subdir('helper')
7271

0 commit comments

Comments
 (0)