diff options
Diffstat (limited to 'tests.branching')
| -rwxr-xr-x | tests.branching/setup | 2 | ||||
| -rw-r--r-- | tests.branching/tag-creates-commit-and-tag.stdout | 6 | ||||
| -rw-r--r-- | tests.branching/tag-tag-works-as-expected.stdout | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tests.branching/setup b/tests.branching/setup index 06a05e90..22c51c24 100755 --- a/tests.branching/setup +++ b/tests.branching/setup @@ -50,7 +50,7 @@ ln -s "$DATADIR/morphs" "$DATADIR/morphs.git" cat <<EOF > "$DATADIR/morphs/hello-system.morph" name: hello-system kind: system -arch: $(uname -m) +arch: $("$SRCDIR/scripts/test-morph" print-architecture) strata: - morph: hello-stratum EOF diff --git a/tests.branching/tag-creates-commit-and-tag.stdout b/tests.branching/tag-creates-commit-and-tag.stdout index 335e6a31..0e885652 100644 --- a/tests.branching/tag-creates-commit-and-tag.stdout +++ b/tests.branching/tag-creates-commit-and-tag.stdout @@ -5,7 +5,7 @@ Date: Tue Jul 31 16:51:54 2012 +0000 Message -commit 74b7fcdd21ac4756e473eb8a577caaabeab208b0 +commit eb4ad9eb2e04ef131c774c79dd4391aea57b7b4d Author: developer <developer@example.com> Date: Tue Jul 31 16:51:54 2012 +0000 @@ -26,7 +26,7 @@ index e012b5f..50da61b 100644 build-mode: test test:morphs -commit 74b7fcdd21ac4756e473eb8a577caaabeab208b0 +commit eb4ad9eb2e04ef131c774c79dd4391aea57b7b4d Author: developer <developer@example.com> AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer <developer@example.com> @@ -34,7 +34,7 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000 Message -commit dc323150575be26e3df0d2dab678560c04281b9f +commit 2a240d0170183a94869bd30a9112d11715627e4c Author: developer <developer@example.com> AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer <developer@example.com> diff --git a/tests.branching/tag-tag-works-as-expected.stdout b/tests.branching/tag-tag-works-as-expected.stdout index c3d723d7..d2eec589 100644 --- a/tests.branching/tag-tag-works-as-expected.stdout +++ b/tests.branching/tag-tag-works-as-expected.stdout @@ -9,7 +9,7 @@ Date: Tue Jul 31 16:51:54 2012 +0000 Second -commit ed4fa3a98076e92d61983202ed44455b3689bc16 +commit 589936e1097412e612ca3843be5f0a9f77a08077 Author: developer <developer@example.com> Date: Tue Jul 31 16:51:54 2012 +0000 @@ -30,7 +30,7 @@ index e012b5f..50da61b 100644 build-mode: test test:morphs -commit ed4fa3a98076e92d61983202ed44455b3689bc16 +commit 589936e1097412e612ca3843be5f0a9f77a08077 Author: developer <developer@example.com> AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer <developer@example.com> @@ -38,7 +38,7 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000 Second -commit dc323150575be26e3df0d2dab678560c04281b9f +commit 2a240d0170183a94869bd30a9112d11715627e4c Author: developer <developer@example.com> AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer <developer@example.com> |