File tree Expand file tree Collapse file tree 3 files changed +2
-15
lines changed
Expand file tree Collapse file tree 3 files changed +2
-15
lines changed Original file line number Diff line number Diff line change @@ -10,9 +10,4 @@ group "Run tests" make --quiet -C t T="$(cd t &&
1010 tr ' \n' ' ' ) " ||
1111handle_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-
1813check_unignored_build_artifacts
Original file line number Diff line number Diff line change @@ -75,7 +75,7 @@ failed:
7575
7676prove : 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
8888unit-tests : $(DEFAULT_UNIT_TEST_TARGET )
8989
9090unit-tests-raw : $(UNIT_TESTS )
9191
9292unit-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-
10295pre-clean :
10396 $(RM ) -r ' $(TEST_RESULTS_DIRECTORY_SQ)'
10497
Original file line number Diff line number Diff 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
7170subdir (' helper' )
7271
You can’t perform that action at this time.
0 commit comments