Add a patch to fix JavaScript tests with gjs 1.50.0
It is more strict about 'let'.
This commit is contained in:
parent
48256e0743
commit
8fcb5110c9
|
|
@ -9,6 +9,8 @@ ostree (2017.11-1) UNRELEASED; urgency=medium
|
||||||
into source tree. Upstream distributes it again.
|
into source tree. Upstream distributes it again.
|
||||||
* Add a patch to fix the new test-help.sh when ostree trivial-httpd
|
* Add a patch to fix the new test-help.sh when ostree trivial-httpd
|
||||||
is enabled. At the moment we still build that tool.
|
is enabled. At the moment we still build that tool.
|
||||||
|
* Add a patch to fix JavaScript tests with gjs 1.50.0, which is
|
||||||
|
more strict about 'let'
|
||||||
|
|
||||||
-- Simon McVittie <smcv@debian.org> Wed, 30 Aug 2017 10:09:26 +0100
|
-- Simon McVittie <smcv@debian.org> Wed, 30 Aug 2017 10:09:26 +0100
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,42 @@
|
||||||
|
From: Simon McVittie <smcv@collabora.com>
|
||||||
|
Date: Fri, 15 Sep 2017 15:32:55 +0100
|
||||||
|
Subject: Fix JavaScript tests with gjs 1.50.0
|
||||||
|
|
||||||
|
In recent gjs, you can't declare a variable with "let" multiple times.
|
||||||
|
|
||||||
|
Signed-off-by: Simon McVittie <smcv@collabora.com>
|
||||||
|
---
|
||||||
|
tests/corrupt-repo-ref.js | 2 +-
|
||||||
|
tests/test-sysroot.js | 6 +++---
|
||||||
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tests/corrupt-repo-ref.js b/tests/corrupt-repo-ref.js
|
||||||
|
index c5f2806..a2085f3 100755
|
||||||
|
--- a/tests/corrupt-repo-ref.js
|
||||||
|
+++ b/tests/corrupt-repo-ref.js
|
||||||
|
@@ -47,7 +47,7 @@ function listObjectChecksumsRecurse(dir, allObjects) {
|
||||||
|
e.close(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
-let [,commit] = repo.resolve_rev(refToCorrupt, false);
|
||||||
|
+repo.resolve_rev(refToCorrupt, false);
|
||||||
|
let [,root,commit] = repo.read_commit(refToCorrupt, null);
|
||||||
|
let allObjects = {};
|
||||||
|
allObjects[commit + '.commit'] = true;
|
||||||
|
diff --git a/tests/test-sysroot.js b/tests/test-sysroot.js
|
||||||
|
index 40397fe..e7250a8 100755
|
||||||
|
--- a/tests/test-sysroot.js
|
||||||
|
+++ b/tests/test-sysroot.js
|
||||||
|
@@ -97,9 +97,9 @@ assertEquals(deploymentPath.query_exists(null), false);
|
||||||
|
|
||||||
|
//// Ok, redeploy, then add a new revision upstream and pull it
|
||||||
|
|
||||||
|
-let [,deployment] = sysroot.deploy_tree('testos', rev, origin,
|
||||||
|
- mergeDeployment, null,
|
||||||
|
- null);
|
||||||
|
+[,deployment] = sysroot.deploy_tree('testos', rev, origin,
|
||||||
|
+ mergeDeployment, null,
|
||||||
|
+ null);
|
||||||
|
newDeployments = deployments;
|
||||||
|
deployments = null;
|
||||||
|
newDeployments.unshift(deployment);
|
||||||
|
|
@ -1 +1,2 @@
|
||||||
Fix-test-help.sh-for-the-case-where-ostree-trivial-httpd-.patch
|
Fix-test-help.sh-for-the-case-where-ostree-trivial-httpd-.patch
|
||||||
|
Fix-JavaScript-tests-with-gjs-1.50.0.patch
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue