grahamc/hydra2 - Change YIZWKGFIITUYV2TW5RGMXY4IGHHIKHJWJ3ZG53LWW3GBYHR4LW4QC

tests: add jobsdir and testdir to ctx hash

This allows us to calculate those directories only once, and just pass them around as necessary.

Created by Cole Helbling on March 4, 2021

YIZWKGFIITUYV2TW5RGMXY4IGHHIKHJWJ3ZG53LWW3GBYHR4LW4QC

Dependencies

In channels

main

Change contents

Replacement in tests/build-products.t at line 18 [6.804]

B:BD[4.244] → [5.30:101]

my $jobset = createBaseJobset("build-products", "build-products.nix");

[4.244]

[4.312]

my $jobset = createBaseJobset("build-products", "build-products.nix", $ctx{jobsdir});

Replacement in tests/evaluate-basic.t at line 19 [7.1]

B:BD[7.368] → [7.368:421]

my $jobset = createBaseJobset("basic", "basic.nix");

[7.368]

[7.421]

my $jobset = createBaseJobset("basic", "basic.nix", $ctx{jobsdir});

Replacement in tests/evaluate-basic.t at line 32 [7.1]
B:BD[7.1142] → [7.1142:1155]
```
done_testing;
```
[7.1142]
```
done_testing;
```

Replacement in tests/evaluate-dependent-jobsets.t at line 16 [8.1]

B:BD[8.270] → [8.270:392]

my $jobset = createJobsetWithOneInput("build-output-as-input", "build-output-as-input.nix", "build1", "build", "build1");

[8.270]

[8.392]

my $jobset = createJobsetWithOneInput("build-output-as-input", "build-output-as-input.nix", "build1", "build", "build1", $ctx{jobsdir});

Replacement in tests/input-types/bzr-checkout.t at line 6 [2.39]
B:BD[2.91] → [2.91:131]
```
(my $datadir, my $pgsql) = test_init();
```
[2.91]
[2.131]
```
my %ctx = test_init();
```

Replacement in tests/input-types/bzr-checkout.t at line 24 [2.39]

B:BD[2.485] → [2.485:529]

  datadir => $datadir,
  testdir => getcwd,

[2.485]

[2.529]

  datadir => $ctx{tmpdir},
  testdir => $ctx{testdir},
  jobsdir => $ctx{jobsdir},

Replacement in tests/input-types/bzr.t at line 6 [2.588]
B:BD[2.640] → [2.640:680]
```
(my $datadir, my $pgsql) = test_init();
```
[2.640]
[2.680]
```
my %ctx = test_init();
```

Replacement in tests/input-types/bzr.t at line 24 [2.588]

B:BD[2.994] → [2.994:1038]

  datadir => $datadir,
  testdir => getcwd,

[2.994]

[2.1038]

  datadir => $ctx{tmpdir},
  testdir => $ctx{testdir},
  jobsdir => $ctx{jobsdir},

Replacement in tests/input-types/darcs.t at line 6 [2.1088]
B:BD[2.1140] → [2.1140:1180]
```
(my $datadir, my $pgsql) = test_init();
```
[2.1140]
[2.1180]
```
my %ctx = test_init();
```

Replacement in tests/input-types/darcs.t at line 24 [2.1088]

B:BD[2.1504] → [2.1504:1548]

  datadir => $datadir,
  testdir => getcwd,

[2.1504]

[2.1548]

  datadir => $ctx{tmpdir},
  testdir => $ctx{testdir},
  jobsdir => $ctx{jobsdir},

Replacement in tests/input-types/deepgit.t at line 6 [2.1600]
B:BD[2.1652] → [2.1652:1692]
```
(my $datadir, my $pgsql) = test_init();
```
[2.1652]
[2.1692]
```
my %ctx = test_init();
```

Replacement in tests/input-types/deepgit.t at line 25 [2.1600]

B:BD[2.2046] → [2.2046:2090]

  datadir => $datadir,
  testdir => getcwd,

[2.2046]

[2.2090]

  datadir => $ctx{tmpdir},
  testdir => $ctx{testdir},
  jobsdir => $ctx{jobsdir},

Replacement in tests/input-types/git-rev.t at line 6 [2.2144]
B:BD[2.2196] → [2.2196:2236]
```
(my $datadir, my $pgsql) = test_init();
```
[2.2196]
[2.2236]
```
my %ctx = test_init();
```

Replacement in tests/input-types/git-rev.t at line 25 [2.2144]

B:BD[2.2624] → [2.2624:2668]

  datadir => $datadir,
  testdir => getcwd,

[2.2624]

[2.2668]

  datadir => $ctx{tmpdir},
  testdir => $ctx{testdir},
  jobsdir => $ctx{jobsdir},

Replacement in tests/input-types/git.t at line 6 [2.2722]
B:BD[2.2774] → [2.2774:2814]
```
(my $datadir, my $pgsql) = test_init();
```
[2.2774]
[2.2814]
```
my %ctx = test_init();
```

Replacement in tests/input-types/git.t at line 24 [2.2722]

B:BD[2.3128] → [2.3128:3172]

  datadir => $datadir,
  testdir => getcwd,

[2.3128]

[2.3172]

  datadir => $ctx{tmpdir},
  testdir => $ctx{testdir},
  jobsdir => $ctx{jobsdir},

Replacement in tests/input-types/hg.t at line 6 [2.3222]
B:BD[2.3274] → [2.3274:3314]
```
(my $datadir, my $pgsql) = test_init();
```
[2.3274]
[2.3314]
```
my %ctx = test_init();
```

Replacement in tests/input-types/hg.t at line 24 [2.3222]

B:BD[2.3623] → [2.3623:3667]

  datadir => $datadir,
  testdir => getcwd,

[2.3623]

[2.3667]

  datadir => $ctx{tmpdir},
  testdir => $ctx{testdir},
  jobsdir => $ctx{jobsdir},

Replacement in tests/input-types/svn-checkout.t at line 6 [2.3716]
B:BD[2.3768] → [2.3768:3808]
```
(my $datadir, my $pgsql) = test_init();
```
[2.3768]
[2.3808]
```
my %ctx = test_init();
```

Replacement in tests/input-types/svn-checkout.t at line 24 [2.3716]

B:BD[2.4162] → [2.4162:4206]

  datadir => $datadir,
  testdir => getcwd,

[2.4162]

[2.4206]

  datadir => $ctx{tmpdir},
  testdir => $ctx{testdir},
  jobsdir => $ctx{jobsdir},

Replacement in tests/input-types/svn.t at line 6 [2.4265]
B:BD[2.4317] → [2.4317:4357]
```
(my $datadir, my $pgsql) = test_init();
```
[2.4317]
[2.4357]
```
my %ctx = test_init();
```

Replacement in tests/input-types/svn.t at line 24 [2.4265]

B:BD[2.4671] → [2.4671:4715]

  datadir => $datadir,
  testdir => getcwd,

[2.4671]

[2.4715]

  datadir => $ctx{tmpdir},
  testdir => $ctx{testdir},
  jobsdir => $ctx{jobsdir},

Replacement in tests/lib/Setup.pm at line 8 [6.518]
∅:D[9.580] → [10.238:247]
∅:D[7.1315] → [10.238:247]
B:BD[10.238] → [10.238:247]
```
use Cwd;
```
[7.1315]
[6.561]
```
use File::Basename;
use Cwd qw(abs_path getcwd);
```
Insertion in tests/lib/Setup.pm at line 67 [6.518]
[3.85]
[3.85]
```
        db => $pgsql,
```

Replacement in tests/lib/Setup.pm at line 69 [6.518]

B:BD[3.109] → [3.109:130]

        db => $pgsql

[3.109]

[3.130]

        testdir => abs_path(dirname(__FILE__) . "/.."),
        jobsdir => abs_path(dirname(__FILE__) . "/../jobs")

Replacement in tests/lib/Setup.pm at line 104 [6.518]

B:BD[11.252] → [12.358:399]

    my ($jobsetName, $nixexprpath) = @_;

[11.252]

[13.37772]

    my ($jobsetName, $nixexprpath, $jobspath) = @_;

Replacement in tests/lib/Setup.pm at line 114 [6.518]

B:BD[12.827] → [12.827:927]

    $jobsetinputals = $jobsetinput->jobsetinputalts->create({altnr => 0, value => getcwd."/jobs"});

[12.827]

[11.770]

    $jobsetinputals = $jobsetinput->jobsetinputalts->create({altnr => 0, value => $jobspath});

Replacement in tests/lib/Setup.pm at line 120 [6.518]

B:BD[11.823] → [12.949:1072]

    my ($jobsetName, $nixexprpath, $name, $type, $uri) = @_;
    my $jobset = createBaseJobset($jobsetName, $nixexprpath);

[11.823]

[11.942]

    my ($jobsetName, $nixexprpath, $name, $type, $uri, $jobspath) = @_;
    my $jobset = createBaseJobset($jobsetName, $nixexprpath, $jobspath);

Insertion in tests/lib/TestScmInput.pm at line 39 [2.5263]

[2.6334]

  my $jobsdir = $args{jobsdir} // die "required arg 'jobsdir' missing";

Replacement in tests/lib/TestScmInput.pm at line 53 [2.5263]

B:BD[2.6768] → [2.6768:6845]

    my $jobset = createJobsetWithOneInput($name, $expr, 'src', $type, $uri);

[2.6768]

[2.6845]

    my $jobset = createJobsetWithOneInput($name, $expr, 'src', $type, $uri, $jobsdir);

Replacement in tests/plugins/runcommand.t at line 26 [14.1230]

B:BD[14.1743] → [14.1743:1801]

my $jobset = createBaseJobset("basic", "runcommand.nix");

[14.1743]

[14.1801]

my $jobset = createBaseJobset("basic", "runcommand.nix", $ctx{jobsdir});

Replacement in tests/plugins/runcommand.t at line 141 [14.1230]
B:BD[14.6967] → [14.6967:6980]
```
done_testing;
```
[14.6967]
```
done_testing;
```

tests: add jobsdir and testdir to ctx hash

Dependencies

In channels

Change contents

Replacement in tests/build-products.t at line 18 [6.804]

Replacement in tests/evaluate-basic.t at line 19 [7.1]

Replacement in tests/evaluate-basic.t at line 32 [7.1]

Replacement in tests/evaluate-dependent-jobsets.t at line 16 [8.1]

Replacement in tests/input-types/bzr-checkout.t at line 6 [2.39]

Replacement in tests/input-types/bzr-checkout.t at line 24 [2.39]

Replacement in tests/input-types/bzr.t at line 6 [2.588]

Replacement in tests/input-types/bzr.t at line 24 [2.588]

Replacement in tests/input-types/darcs.t at line 6 [2.1088]

Replacement in tests/input-types/darcs.t at line 24 [2.1088]

Replacement in tests/input-types/deepgit.t at line 6 [2.1600]

Replacement in tests/input-types/deepgit.t at line 25 [2.1600]

Replacement in tests/input-types/git-rev.t at line 6 [2.2144]

Replacement in tests/input-types/git-rev.t at line 25 [2.2144]

Replacement in tests/input-types/git.t at line 6 [2.2722]

Replacement in tests/input-types/git.t at line 24 [2.2722]

Replacement in tests/input-types/hg.t at line 6 [2.3222]

Replacement in tests/input-types/hg.t at line 24 [2.3222]

Replacement in tests/input-types/svn-checkout.t at line 6 [2.3716]

Replacement in tests/input-types/svn-checkout.t at line 24 [2.3716]

Replacement in tests/input-types/svn.t at line 6 [2.4265]