summaryrefslogtreecommitdiff
path: root/tests.as-root
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-08-19 13:09:39 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-08-19 13:28:19 +0000
commit7f25c6bea678eb82fdfe024013dac5d0c01af152 (patch)
tree5d6aaed1754a2392e35a8f548171f4757584c77f /tests.as-root
parent754200f3b2bf79d5327b3926e04a8f4136dc035e (diff)
downloadmorph-7f25c6bea678eb82fdfe024013dac5d0c01af152.tar.gz
Use new edit instead of old one in tests
The test suite got adapted so it requires the new edit instead of the old one. So use the new edit instead of the old one in the test. This is a kluge, and needs to be reverted after the BR10 release.
Diffstat (limited to 'tests.as-root')
-rwxr-xr-xtests.as-root/build-handles-stratum-build-depends.script2
-rwxr-xr-xtests.as-root/build-with-external-strata.script2
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 22d07c72..fd6a0544 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" edit linux-system hello-stratum
+"$SRCDIR/scripts/test-morph" new-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 f5d86dfe..d722f907 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" edit hello-system stratum2
+"$SRCDIR/scripts/test-morph" new-edit hello-system stratum2
cd "test:external-strata"
awk '