diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-08-28 14:22:01 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-08-29 15:07:32 +0000 |
| commit | b6b219d75ef63ca33a10cb6cd32dd9b1669ecfa8 (patch) | |
| tree | 6eeb99eed605ef6c9944d2781ce57fed10361f10 /tests.as-root | |
| parent | f3293ecbda184248ea370aa8a419968cb005ba03 (diff) | |
| download | morph-b6b219d75ef63ca33a10cb6cd32dd9b1669ecfa8.tar.gz | |
Revert "Merge branch 'liw/restore-old-cmds'"
This reverts commit 2dc382a2a9ae977b1158002cd2631ec5593959c1, reversing
changes made to 89a019af088ff62459699a6efdadf8ac8fe35dd9.
We decided to restore the old commands for the release, as we weren't
confident the new implementations were correct yet.
To gain that confidence we need to use them, so the old versions are no
longer available, and the new edit code is used when the edit subcommand
is invoked.
Doing so also requires the test suite to use the edit command instead of
new-edit.
Diffstat (limited to 'tests.as-root')
| -rwxr-xr-x | tests.as-root/build-handles-stratum-build-depends.script | 2 | ||||
| -rwxr-xr-x | tests.as-root/build-with-external-strata.script | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests.as-root/build-handles-stratum-build-depends.script b/tests.as-root/build-handles-stratum-build-depends.script index fd6a0544..22d07c72 100755 --- a/tests.as-root/build-handles-stratum-build-depends.script +++ b/tests.as-root/build-handles-stratum-build-depends.script @@ -39,7 +39,7 @@ cd test/stratum-build-depends/test:morphs # be updated here. Any build-depends of any altered strata also need to # be altered, such as the 'tools-stratum' which depends on linux-stratum # If they are not updated, the build command will fail. -"$SRCDIR/scripts/test-morph" new-edit linux-system hello-stratum +"$SRCDIR/scripts/test-morph" edit linux-system hello-stratum # Likewise, this command must update build-depends or the 'repo' field will # not be changed in the temporary build branch, leading to: diff --git a/tests.as-root/build-with-external-strata.script b/tests.as-root/build-with-external-strata.script index d722f907..f5d86dfe 100755 --- a/tests.as-root/build-with-external-strata.script +++ b/tests.as-root/build-with-external-strata.script @@ -34,7 +34,7 @@ cd "$DATADIR/workspace" # don't commit it, in one of the external strata, as a challenge for # 'morph build'. cd "branch1" -"$SRCDIR/scripts/test-morph" new-edit hello-system stratum2 +"$SRCDIR/scripts/test-morph" edit hello-system stratum2 cd "test:external-strata" awk ' |