grahamc/hydra2 - Change 3RL7VFKEVVQBVKLKM7ZS3M67BOGGJ3OWPARHG64AOUTZTPPYCHLQC

Add tests for "git describe --long".

* Move test logic to scm-update.sh scripts.
* Check for &quot;git describe --long&quot;.

Created by Nicolas Pierron on April 29, 2012

3RL7VFKEVVQBVKLKM7ZS3M67BOGGJ3OWPARHG64AOUTZTPPYCHLQC

Dependencies

In channels

main

Change contents

Replacement in tests/Makefile.am at line 36 [6.92]

B:BD[5.1] → [5.1:85]

repos : dirs git-repo hg-repo svn-repo svn-checkout-repo bzr-repo bzr-checkout-repo

[5.1]

[6.252]

repos : dirs

Deletion in tests/Makefile.am at line 46 [6.92]

B:BD[7.391] → [8.67:68]

B:BD[8.68] → [9.62:73]

∅:D[9.73] → [8.78:196]

B:BD[8.78] → [8.78:196]

B:BD[8.196] → [9.74:84]

∅:D[9.84] → [8.205:245]

B:BD[8.205] → [8.205:245]

B:BD[8.245] → [3.52:129]

∅:D[3.129] → [8.312:313]

B:BD[8.312] → [8.312:313]

B:BD[8.313] → [9.85:96]

∅:D[9.96] → [8.323:349]

B:BD[8.323] → [8.323:349]

B:BD[8.349] → [2.0:53]

∅:D[2.53] → [8.397:509]

∅:D[10.404] → [8.397:509]

B:BD[8.397] → [8.397:509]

B:BD[8.509] → [11.119:150]

B:BD[11.150] → [5.95:180]

∅:D[5.180] → [11.205:257]

B:BD[11.205] → [11.205:257]

B:BD[11.257] → [5.181:259]

B:BD[5.259] → [12.854:855]

∅:D[12.855] → [13.237:346]

B:BD[11.307] → [13.237:346]

B:BD[13.346] → [5.260:261]


git-repo :
	git init git-repo
	touch git-repo/git-file
	(cd git-repo; git add git-file ; git commit -m "add git file" git-file)
hg-repo :
	hg init hg-repo
	touch hg-repo/hg-file
	(cd hg-repo; hg add hg-file ; hg commit -m "add hg file" hg-file -u foobar)
svn-repo :
	svnadmin create svn-repo
	svn co file://$(abs_builddir)/svn-repo svn-checkout
	touch svn-checkout/svn-file
	svn add svn-checkout/svn-file
	svn commit -m "add svn file" svn-checkout/svn-file
bzr-repo :
	bzr init bzr-repo
	BZR_HOME=$(abs_builddir)/data bzr whoami "build <build@donotemail.com>" -d bzr-repo
	touch bzr-repo/bzr-file
	bzr add bzr-repo/bzr-file
	BZR_HOME=$(abs_builddir)/data bzr commit -m "add bzr-file" bzr-repo/bzr-file
svn-checkout-repo :
	ln -s svn-repo svn-checkout-repo
bzr-checkout-repo :
	ln -s bzr-repo bzr-checkout-repo

Replacement in tests/Setup.pm at line 78 [14.518]

B:BD[4.4354] → [4.4354:4463]

  my ($scm, $update, $repo) = @_;
  my ($res, $stdout, $stderr) = captureStdoutStderr(60, ($update, $repo));

[4.4354]

[4.4463]

  my ($scm, $update) = @_;
  my ($res, $stdout, $stderr) = captureStdoutStderr(60, ($update, $scm));

Replacement in tests/Setup.pm at line 81 [14.518]

B:BD[4.4529] → [4.4529:4620]

  print STDOUT "Update $scm repository: $stdout" if $stdout ne "";
  return $stdout ne "";

[4.4529]

[15.822]

  my ($message, $loop, $status) = $stdout =~ m/::(.*) -- (.*) -- (.*)::/;
  print STDOUT "Update $scm repository: $message\n";
  return ($loop eq "continue", $status eq "updated");

Replacement in tests/evaluation-tests.pl at line 10 [14.804]
B:BD[14.969] → [4.4621:4651]
```
use Test::Simple tests => 48;
```
[14.969]
[14.998]
```
use Test::Simple tests => 60;
```

Replacement in tests/evaluation-tests.pl at line 55 [14.804]

∅:D[16.1184] → [17.2279:2298]

B:BD[14.1680] → [17.2279:2298]

∅:D[17.2298] → [13.1655:1763]

B:BD[14.1680] → [13.1655:1763]

B:BD[13.1763] → [17.2299:2400]

# Test scm inputs 
my @scminputs = ("svn", "svn-checkout", "git", "bzr", "bzr-checkout", "hg");
foreach my $scm (@scminputs) {
  $jobset = createJobsetWithOneInput($scm, "$scm-input.nix", "src", $scm, "$jobsBaseUri/$scm-repo");

[16.1184]

[18.252]

# Test scm inputs
my @scminputs = (
    {
        name => "svn",
        nixexpr => "svn-input.nix",
        type => "svn",
        uri => "$jobsBaseUri/svn-repo",
        update => getcwd . "/jobs/svn-update.sh"
    },
    {
        name => "svn-checkout",
        nixexpr => "svn-checkout-input.nix",
        type => "svn-checkout",
        uri => "$jobsBaseUri/svn-checkout-repo",
        update => getcwd . "/jobs/svn-checkout-update.sh"
    },
    {
        name => "git",
        nixexpr => "git-input.nix",
        type => "git",
        uri => "$jobsBaseUri/git-repo",
        update => getcwd . "/jobs/git-update.sh"
    },
    {
        name => "deepgit",
        nixexpr => "deepgit-input.nix",
        type => "git",
        uri => "$jobsBaseUri/git-repo master 1",
        update => getcwd . "/jobs/git-update.sh"
    },
    {
        name => "bzr",
        nixexpr => "bzr-input.nix",
        type => "bzr",
        uri => "$jobsBaseUri/bzr-repo",
        update => getcwd . "/jobs/bzr-update.sh"
    },
    {
        name => "bzr-checkout",
        nixexpr => "bzr-checkout-input.nix",
        type => "bzr-checkout",
        uri => "$jobsBaseUri/bzr-checkout-repo",
        update => getcwd . "/jobs/bzr-checkout-update.sh"
    },
    {
        name => "hg",
        nixexpr => "hg-input.nix",
        type => "hg",
        uri => "$jobsBaseUri/hg-repo",
        update => getcwd . "/jobs/hg-update.sh"
    }
);

Replacement in tests/evaluation-tests.pl at line 108 [14.804]

B:BD[18.253] → [4.4652:4981]

  my $c = 1;
  my $q = 1;
  do {
    # Verify that it can be fetched and queued.
    ok(evalSucceeds($jobset),                  "$c Evaluating jobs/$scm-input.nix should exit with return code 0."); $c++;
    ok(nrQueuedBuildsForJobset($jobset) == $q, "$c Evaluating jobs/$scm-input.nix should result in 1 build in queue"); $c++;

[18.253]

[19.0]

foreach my $scm ( @scminputs ) {
  my $scmName = $scm->{"name"};
  my $nixexpr = $scm->{"nixexpr"};
  my $type = $scm->{"type"};
  my $uri = $scm->{"uri"};
  my $update = $scm->{"update"};
  $jobset = createJobsetWithOneInput($scmName, $nixexpr, "src", $type, $uri);

Replacement in tests/evaluation-tests.pl at line 116 [14.804]

B:BD[19.1] → [4.4982:5291]

    # Verify that it is deterministic and not queued again.
    ok(evalSucceeds($jobset),                  "$c Evaluating jobs/$scm-input.nix should exit with return code 0."); $c++;
    ok(nrQueuedBuildsForJobset($jobset) == $q, "$c Evaluating jobs/$scm-input.nix should result in $q build in queue"); $c++;

[19.1]

[4.5291]

  my $state = 0;
  my $q = 0;
  my ($loop, $updated) = updateRepository($scmName, $update);
  while($loop) {
    my $c = 0;

Replacement in tests/evaluation-tests.pl at line 122 [14.804]

B:BD[4.5292] → [4.5292:5394]

    $q++;
  } while(updateRepository($scm, getcwd . "/jobs/$scm-update.sh", getcwd . "/$scm-repo/"));

[4.5292]

[4.5394]

    # Verify that it can be fetched and possibly queued.
    ok(evalSucceeds($jobset),                  "$scmName:$state.$c: Evaluating nix-expression."); $c++;
    # Verify that the evaluation has queued a new job and evaluate again to ...
    if ($updated) {
        $q++;
        ok(nrQueuedBuildsForJobset($jobset) == $q, "$scmName:$state.$c: Expect $q jobs in the queue."); $c++;
        ok(evalSucceeds($jobset),                  "$scmName:$state.$c: Evaluating nix-expression again."); $c++;
    }
    # ... check that it is deterministic and not queued again.
    ok(nrQueuedBuildsForJobset($jobset) == $q, "$scmName:$state.$c: Expect $q jobs in the queue."); $c++;
    $state++;
    ($loop, $updated) = updateRepository($scmName, $update, getcwd . "/$scmName-repo/");
  }

Insertion in tests/jobs/bzr-checkout-update.sh at line 2 [4.5398]

[4.5410]


repo="$1"
STATE_FILE=$(pwd)/.bzr-checkout-state
if test -e $STATE_FILE; then
    state=$(cat $STATE_FILE)
    test $state -gt 1 && state=0
else
    state=0;
fi
case $state in
    (0) echo "::Create repo. -- continue -- updated::"
    ln -s bzr-repo bzr-checkout-repo
    ;;
    (*) echo "::End. -- stop -- nothing::" ;;
esac
echo $(($state + 1)) > $STATE_FILE

Insertion in tests/jobs/bzr-update.sh at line 2 [4.5459]

[4.5471]


repo="$1"
STATE_FILE=$(pwd)/.bzr-state
if test -e $STATE_FILE; then
    state=$(cat $STATE_FILE)
    test $state -gt 1 && state=0
else
    state=0;
fi
export BZR_HOME; # Set by the Makefile
case $state in
    (0) echo "::Create repo. -- continue -- updated::"
    bzr init bzr-repo
    bzr whoami "build <build@donotemail.com>" -d bzr-repo
    touch bzr-repo/bzr-file
    bzr add bzr-repo/bzr-file
    bzr commit -m "add bzr-file" bzr-repo/bzr-file
    ;;
    (*) echo "::End. -- stop -- nothing::";;
esac
echo $(($state + 1)) > $STATE_FILE

File addition: deepgit-builder.sh (----------)

[14.1729]

#! /bin/sh
set -e
mkdir $out
cp -v $src/* $out/
git describe --long > $out/Version

File addition: deepgit-input.nix (----------)

[14.1729]

with import ./config.nix;
{ src }:
{  
  copy = 
    mkDerivation {
      name = "git-input";
      builder = ./scm-builder.sh;
      inherit src;
    };
}

Insertion in tests/jobs/git-update.sh at line 2 [4.5511]
[4.5523]
[4.5523]
```
# This script is used both by git & deepgit checks.
```
Replacement in tests/jobs/git-update.sh at line 4 [4.5511]
B:BD[4.5524] → [4.5524:5550]
```
cd "$1"
STATE_FILE=.state
```
[4.5524]
[4.5550]
```
repo=git-repo
STATE_FILE=$(pwd)/.git-state
```
Insertion in tests/jobs/git-update.sh at line 8 [4.5511]
[4.5608]
[4.5608]
```
    test $state -gt 3 && state=0
```

Replacement in tests/jobs/git-update.sh at line 14 [4.5511]

B:BD[4.5645] → [4.5645:5776]

    (0)
    echo "Add new file."
    touch git-file-2
    git add git-file-2 >&2
    git commit -m "add git file 2" git-file-2 >&2

[4.5645]

[4.5776]

    (0) echo "::Create repo. -- continue -- updated::"
    git init $repo
    cd $repo
    touch foo
    git add foo
    git commit -m "Add foo"
    git tag -a -m "First Tag." tag0
    git checkout -b master HEAD

Replacement in tests/jobs/git-update.sh at line 23 [4.5511]

B:BD[4.5783] → [4.5783:5927]

    (1)
    echo "Rewrite commit."
    echo 1 > git-file-2
    git add git-file-2 >&2
    git commit --amend -m "add git file 2" git-file-2 >&2

[4.5783]

[4.5927]

    (1) echo "::Create new commit. -- continue -- updated::"
    cd $repo
    # Increase depth to make sure the tag is not fetched by default.
    echo 0 > foo
    git add foo
    git commit -m "Increase depth 0"
    echo 1 > foo
    git add foo
    git commit -m "Increase depth 1"
    echo 2 > foo
    git add foo
    git commit -m "Increase depth 2"
    echo 0 > bar
    git add bar
    git commit -m "Add bar with 0"
    ;;
    (2) echo "::Amend commit. (push -f) -- continue -- updated::"
    cd $repo
    echo 1 > bar
    git add bar
    git commit --amend -m "Add bar with 1"

Insertion in tests/jobs/git-update.sh at line 45 [4.5511]

[4.5934]

    (*) echo "::End. -- stop -- nothing::"
    rm -rf $repo
    ;;

Insertion in tests/jobs/hg-update.sh at line 2 [4.6015]

[4.6027]


repo="$1"
STATE_FILE=$(pwd)/.hg-state
if test -e $STATE_FILE; then
    state=$(cat $STATE_FILE)
    test $state -gt 1 && state=0
else
    state=0;
fi
case $state in
    (0) echo "::Create repo. -- continue -- updated::"
    hg init hg-repo
    touch hg-repo/hg-file
    cd hg-repo
    hg add hg-file
    hg commit -m "add hg file" hg-file -u foobar
    ;;
    (*) echo "::End. -- stop -- nothing::" ;;
esac
echo $(($state + 1)) > $STATE_FILE

Insertion in tests/jobs/svn-checkout-update.sh at line 2 [4.6066]

[4.6078]


repo="$1"
STATE_FILE=$(pwd)/.svn-checkout-state
if test -e $STATE_FILE; then
    state=$(cat $STATE_FILE)
    test $state -gt 1 && state=0
else
    state=0;
fi
case $state in
    (0) echo "::Create repo. -- continue -- updated::"
    ln -s svn-repo svn-checkout-repo
    ;;
    (*) echo "::End. -- stop -- nothing::" ;;
esac
echo $(($state + 1)) > $STATE_FILE

Insertion in tests/jobs/svn-update.sh at line 2 [4.6127]

[4.6139]


repo="$1"
STATE_FILE=$(pwd)/.svn-state
if test -e $STATE_FILE; then
    state=$(cat $STATE_FILE)
    test $state -gt 1 && state=0
else
    state=0;
fi
case $state in
    (0) echo "::Create repo. -- continue -- updated::"
    svnadmin create svn-repo
    svn co $repo svn-checkout
    touch svn-checkout/svn-file
    svn add svn-checkout/svn-file
    svn commit -m "add svn file" svn-checkout/svn-file
    ;;
    (*) echo "::End. -- stop -- nothing::";;
esac
echo $(($state + 1)) > $STATE_FILE