diff options
author | Colin Walters <walters@verbum.org> | 2017-07-20 10:32:44 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-07-21 15:45:27 +0000 |
commit | ed99b4169e06c6a204f92e85b3e323abdb542bbe (patch) | |
tree | 532e452f866b0c9acf24017a683ba895d2233518 /tests | |
parent | ef6f6bc688f3381a66e6bcb1fa440d5201537fd1 (diff) | |
download | ostree-ed99b4169e06c6a204f92e85b3e323abdb542bbe.tar.gz |
tests: More fixes for gjs tests
Previous to this commit, the gjs tests were installed-only; and our
logic for handling the "--enable-installed-tests=exclusive" logic
actually also meant they weren't installed.
It did work for me locally with `--enable-installed-tests`.
However, to make things fully symmetric, let's enable the js tests to also be
run under `make check`.
Also remove `corrupt-repo-ref.js` from the PAPR invocation since it's not
actually a unit test, it's a utility helper.
Closes: #1022
Approved by: jlebon
Diffstat (limited to 'tests')
-rwxr-xr-x[-rw-r--r--] | tests/test-core.js | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | tests/test-sizes.js | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | tests/test-sysroot.js | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/tests/test-core.js b/tests/test-core.js index 64d1b62d..8a06b6fa 100644..100755 --- a/tests/test-core.js +++ b/tests/test-core.js @@ -25,6 +25,8 @@ function assertEquals(a, b) { throw new Error("assertion failed " + JSON.stringify(a) + " == " + JSON.stringify(b)); } +print('1..1') + let testDataDir = Gio.File.new_for_path('test-data'); testDataDir.make_directory(null); testDataDir.get_child('some-file').replace_contents("hello world!", null, false, 0, null); @@ -66,4 +68,4 @@ repo.commit_transaction(null, null); [,readCommit] = repo.resolve_rev('someref', true); assertEquals(readCommit, null); -print("test-core complete"); +print("ok test-core"); diff --git a/tests/test-sizes.js b/tests/test-sizes.js index 5cf765fc..71e76515 100644..100755 --- a/tests/test-sizes.js +++ b/tests/test-sizes.js @@ -26,6 +26,8 @@ function assertEquals(a, b) { throw new Error("assertion failed " + JSON.stringify(a) + " == " + JSON.stringify(b)); } +print('1..1') + let testDataDir = Gio.File.new_for_path('test-data'); testDataDir.make_directory(null); testDataDir.get_child('some-file').replace_contents("hello world!", null, false, 0, null); @@ -79,4 +81,4 @@ if (expectedUncompressedSizes.length > 0) { throw new Error("Failed to match expectedUncompressedSizes: " + JSON.stringify(expectedUncompressedSizes)); } -print("test-sizes complete"); +print("ok test-sizes"); diff --git a/tests/test-sysroot.js b/tests/test-sysroot.js index 7e8fcf7a..d7d3dab3 100644..100755 --- a/tests/test-sysroot.js +++ b/tests/test-sysroot.js @@ -33,11 +33,13 @@ function assertNotEquals(a, b) { function libtestExec(shellCode) { let testdatadir = GLib.getenv("G_TEST_SRCDIR"); - let libtestPath = GLib.build_filenamev([testdatadir, 'libtest.sh']) + let libtestPath = GLib.build_filenamev([testdatadir, 'tests/libtest.sh']) let proc = Gio.Subprocess.new(['bash', '-c', 'set -xeuo pipefail; . ' + GLib.shell_quote(libtestPath) + '; ' + shellCode], 0); proc.wait_check(null); } +print('1..1') + libtestExec('setup_os_repository archive-z2 syslinux'); let upstreamRepo = OSTree.Repo.new(Gio.File.new_for_path('testos-repo')); @@ -145,3 +147,5 @@ newDeployments = [deployment, newDeployment, thirdDeployment]; sysroot.write_deployments(newDeployments, null); deployments = sysroot.get_deployments(); assertEquals(deployments.length, 3); + +print("ok test-sysroot") |