From 56a922280fbf2012f2b790691450a7e4fdc9e1c8 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 9 Aug 2016 13:52:43 -0400 Subject: [PATCH] tests: Port sysroot.js away from libgsystem My case-sensitive `git grep` didn't find this one originally, but the Travis+Debian setup was configured to run it. Closes: #451 Approved by: jlebon --- tests/test-sysroot.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tests/test-sysroot.js b/tests/test-sysroot.js index 7c31659d..7e8fcf7a 100644 --- a/tests/test-sysroot.js +++ b/tests/test-sysroot.js @@ -19,8 +19,6 @@ const GLib = imports.gi.GLib; const Gio = imports.gi.Gio; - -const GSystem = imports.gi.GSystem; const OSTree = imports.gi.OSTree; function assertEquals(a, b) { @@ -36,12 +34,8 @@ function assertNotEquals(a, b) { function libtestExec(shellCode) { let testdatadir = GLib.getenv("G_TEST_SRCDIR"); let libtestPath = GLib.build_filenamev([testdatadir, 'libtest.sh']) - let proc = GSystem.Subprocess.new_simple_argv(['bash', '-c', - 'set -xeuo pipefail; . ' + GLib.shell_quote(libtestPath) + '; ' + shellCode], - GSystem.SubprocessStreamDisposition.INHERIT, - GSystem.SubprocessStreamDisposition.INHERIT, - null); - proc.wait_sync_check(null); + let proc = Gio.Subprocess.new(['bash', '-c', 'set -xeuo pipefail; . ' + GLib.shell_quote(libtestPath) + '; ' + shellCode], 0); + proc.wait_check(null); } libtestExec('setup_os_repository archive-z2 syslinux');