From 10e036238c229e97e5aaf702680a03e687d114b2 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 12 Apr 2016 16:27:11 -0400 Subject: [PATCH 1/2] Add eval test for specific git revision --- tests/evaluation-tests.pl | 9 ++++++++- tests/jobs/git-rev-input.nix | 10 ++++++++++ tests/jobs/git-rev-update.sh | 31 +++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 tests/jobs/git-rev-input.nix create mode 100755 tests/jobs/git-rev-update.sh diff --git a/tests/evaluation-tests.pl b/tests/evaluation-tests.pl index 71673f79..68bf8e40 100644 --- a/tests/evaluation-tests.pl +++ b/tests/evaluation-tests.pl @@ -7,7 +7,7 @@ use Setup; my $db = Hydra::Model::DB->new; -use Test::Simple tests => 72; +use Test::Simple tests => 76; hydra_setup($db); @@ -75,6 +75,13 @@ my @scminputs = ( uri => "$jobsBaseUri/git-repo", update => getcwd . "/jobs/git-update.sh" }, + { + name => "git-rev", + nixexpr => "git-rev-input.nix", + type => "git", + uri => "$jobsBaseUri/git-repo 7f60df502b96fd54bbfa64dd94b56d936a407701", + update => getcwd . "/jobs/git-rev-update.sh" + }, { name => "deepgit", nixexpr => "deepgit-input.nix", diff --git a/tests/jobs/git-rev-input.nix b/tests/jobs/git-rev-input.nix new file mode 100644 index 00000000..4fe49118 --- /dev/null +++ b/tests/jobs/git-rev-input.nix @@ -0,0 +1,10 @@ +with import ./config.nix; +{ src }: +{ + copy = + mkDerivation { + name = "git-rev-input"; + builder = ./scm-builder.sh; + inherit src; + }; +} diff --git a/tests/jobs/git-rev-update.sh b/tests/jobs/git-rev-update.sh new file mode 100755 index 00000000..6ed34b2b --- /dev/null +++ b/tests/jobs/git-rev-update.sh @@ -0,0 +1,31 @@ +#! /bin/sh +set -e + +repo=git-repo +export HOME=$(pwd) +STATE_FILE=$(pwd)/.git-rev-state +if test -e $STATE_FILE; then + state=1 + rm $STATE_FILE +else + state=0 + touch $STATE_FILE +fi + +echo "STATE: $state" +case $state in + (0) echo "::Create repo. -- continue -- updated::" + git init $repo + cd $repo + git config --global user.email "you@example.com" + git config --global user.name "Your Name" + + touch foo + git add foo + GIT_AUTHOR_DATE="1970-01-01T00:00:00 +0000" GIT_COMMITTER_DATE="1970-01-01T00:00:00 +0000" git commit -m "Add foo" + git tag -a -m "First Tag." tag0 + ;; + (*) echo "::End. -- stop -- nothing::" + rm -rf $repo + ;; +esac From 93f98464253afd033ce965e629fa7443786f6680 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 12 Apr 2016 16:30:42 -0400 Subject: [PATCH 2/2] git-rev: Remove superfluous git tag --- tests/jobs/git-rev-update.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/jobs/git-rev-update.sh b/tests/jobs/git-rev-update.sh index 6ed34b2b..d48268f4 100755 --- a/tests/jobs/git-rev-update.sh +++ b/tests/jobs/git-rev-update.sh @@ -23,7 +23,6 @@ case $state in touch foo git add foo GIT_AUTHOR_DATE="1970-01-01T00:00:00 +0000" GIT_COMMITTER_DATE="1970-01-01T00:00:00 +0000" git commit -m "Add foo" - git tag -a -m "First Tag." tag0 ;; (*) echo "::End. -- stop -- nothing::" rm -rf $repo