summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2011-12-01 12:05:39 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2011-12-01 12:05:39 +0000
commit871308c2c4c97c2c7bf4318f832a90924d793b03 (patch)
tree214831d70f591479fa1365da3c5b2adeea7f5cda /tests
parent618a2595b6a657ab9d7d48ea3634d8533c563dcf (diff)
downloadmorph-871308c2c4c97c2c7bf4318f832a90924d793b03.tar.gz
fix build-system test related changed so tests actually pass
Diffstat (limited to 'tests')
-rw-r--r--tests/build-chunk.stdout1
-rw-r--r--tests/build-stratum.stdout1
-rwxr-xr-xtests/build-system.script4
-rw-r--r--tests/build-system.stdout1
4 files changed, 5 insertions, 2 deletions
diff --git a/tests/build-chunk.stdout b/tests/build-chunk.stdout
index 7f39aa3e..8077cac2 100644
--- a/tests/build-chunk.stdout
+++ b/tests/build-chunk.stdout
@@ -4,4 +4,5 @@ baserock/
baserock/hello.meta
bin/
bin/hello
+etc/
diff --git a/tests/build-stratum.stdout b/tests/build-stratum.stdout
index e92be75b..4f422ea4 100644
--- a/tests/build-stratum.stdout
+++ b/tests/build-stratum.stdout
@@ -4,3 +4,4 @@ baserock/hello-stratum.meta
baserock/hello.meta
bin/
bin/hello
+etc/
diff --git a/tests/build-system.script b/tests/build-system.script
index f206a277..3a1c78b9 100755
--- a/tests/build-system.script
+++ b/tests/build-system.script
@@ -17,13 +17,13 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-set -ex
+set -e
cache="$DATADIR/build-system-cache"
mkdir "$cache"
./morph --no-default-configs build repo farrokh hello-system.morph \
--git-base-url "file://$DATADIR/" \
- --cachedir="$cache" --keep-path --verbose
+ --cachedir="$cache" --keep-path
find "$cache" -name '*.system.*' -type f | wc -l
rm -rf "$cache"
diff --git a/tests/build-system.stdout b/tests/build-system.stdout
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/tests/build-system.stdout
@@ -0,0 +1 @@
+1