@matheusbsbs / matheus-bagliano / commits / 87094fc2da

ci: run test round with parallel-checkout enabled

We already have tests for the basic parallel-checkout operations. But this code can also run be executed by other commands, such as git-read-tree and git-sparse-checkout, which are currently not tested with multiple workers. To promote a wider test coverage without duplicating tests: 1. Add the GIT_TEST_CHECKOUT_WORKERS environment variable, to optionally force parallel-checkout execution during the whole test suite. 2. Set this variable (with a value of 2) in the second test round of our linux-gcc CI job. This round runs `make test` again with some optional GIT_TEST_* variables enabled, so there is no additional overhead in exercising the parallel-checkout code here. Note that tests checking out less than two parallel-eligible entries will fall back to the sequential mode. Nevertheless, it's still a good exercise for the parallel-checkout framework as the fallback codepath also writes the queued entries using the parallel-checkout functions (only without spawning any worker). Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Matheus Tavares committed May 4, 2021 at 13:27 UTC 87094fc2daa9613c2fad454dbb068a8f23ce8de8

4 files changed +22

ci/run-build-and-tests.sh

@@ -25,6 +25,7 @@ linux-gcc)

25 export GIT_TEST_ADD_I_USE_BUILTIN=1

26 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master

27 export GIT_TEST_WRITE_REV_INDEX=1

28 + export GIT_TEST_CHECKOUT_WORKERS=2

29 make test

30 ;;

31 linux-clang)

parallel-checkout.c

+14

@@ -35,6 +35,20 @@ static const int DEFAULT_NUM_WORKERS = 1;

36 void get_parallel_checkout_configs(int *num_workers, int *threshold)

37 {

38 + char *env_workers = getenv("GIT_TEST_CHECKOUT_WORKERS");

39 +

40 + if (env_workers && *env_workers) {

41 + if (strtol_i(env_workers, 10, num_workers)) {

42 + die("invalid value for GIT_TEST_CHECKOUT_WORKERS: '%s'",

43 + env_workers);

44 + }

45 + if (*num_workers < 1)

46 + *num_workers = online_cpus();

47 +

48 + *threshold = 0;

49 + return;

50 + }

51 +

52 if (git_config_get_int("checkout.workers", num_workers))

53 *num_workers = DEFAULT_NUM_WORKERS;

54 else if (*num_workers < 1)

t/README

@@ -436,6 +436,10 @@ and "sha256".

436 GIT_TEST_WRITE_REV_INDEX=<boolean>, when true enables the

437 'pack.writeReverseIndex' setting.

438

439 +GIT_TEST_CHECKOUT_WORKERS=<n> overrides the 'checkout.workers' setting

440 +to <n> and 'checkout.thresholdForParallelism' to 0, forcing the

441 +execution of the parallel-checkout code.

442 +

443 Naming Tests

444 ------------

445

t/lib-parallel-checkout.sh

@@ -1,5 +1,8 @@

1 # Helpers for tests invoking parallel-checkout

3 +# Parallel checkout tests need full control of the number of workers

4 +unset GIT_TEST_CHECKOUT_WORKERS

5 +

6 set_checkout_config () {

7 if test $# -ne 2

8 then