Add upstream patch to fix GObject/Javascript tests.
This commit is contained in:
parent
6cbdcdc4bf
commit
45f9b98026
|
@ -0,0 +1,32 @@
|
||||||
|
From 6afb7336e33dc28c4fd1a4545a8298ee36c10723 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||||
|
Date: Wed, 27 Jun 2012 10:54:02 +0100
|
||||||
|
Subject: [PATCH] gobject: bindtests: gjs exception behaviour changed, fix
|
||||||
|
test.
|
||||||
|
|
||||||
|
When libguestfs calls 'error (g, "error")', gjs in F17 throws
|
||||||
|
error.message == "Error invoking Guestfs.test0rinterr: error"
|
||||||
|
|
||||||
|
In F18, error.message is simply the string "error".
|
||||||
|
|
||||||
|
Fix the test so it works for both cases.
|
||||||
|
---
|
||||||
|
gobject/bindtests-manual.js | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/gobject/bindtests-manual.js b/gobject/bindtests-manual.js
|
||||||
|
index 84a1546..8f4ef15 100644
|
||||||
|
--- a/gobject/bindtests-manual.js
|
||||||
|
+++ b/gobject/bindtests-manual.js
|
||||||
|
@@ -26,7 +26,7 @@ function check_error(f) {
|
||||||
|
g[f]();
|
||||||
|
} catch (error) {
|
||||||
|
threw = true;
|
||||||
|
- if (!error.message.match(/: error$/)) {
|
||||||
|
+ if (!error.message.match(/error$/)) {
|
||||||
|
print(f + " threw unexpected error: " + error.message);
|
||||||
|
fail = true;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
1.7.10.2
|
||||||
|
|
|
@ -22,7 +22,7 @@ Summary: Access and modify virtual machine disk images
|
||||||
Name: libguestfs
|
Name: libguestfs
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 1.19.13
|
Version: 1.19.13
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
URL: http://libguestfs.org/
|
URL: http://libguestfs.org/
|
||||||
|
@ -40,6 +40,9 @@ BuildRequires: autoconf, automake, libtool, gettext-devel
|
||||||
# patch.
|
# patch.
|
||||||
Patch4: libguestfs-1.19.2-remove-udev-from-packagelist.patch
|
Patch4: libguestfs-1.19.2-remove-udev-from-packagelist.patch
|
||||||
|
|
||||||
|
# Upstream patch to fix GObject/Javascript tests.
|
||||||
|
Patch5: 0001-gobject-bindtests-gjs-exception-behaviour-changed-fi.patch
|
||||||
|
|
||||||
%if 0%{?rhel} >= 7
|
%if 0%{?rhel} >= 7
|
||||||
ExclusiveArch: x86_64
|
ExclusiveArch: x86_64
|
||||||
%endif
|
%endif
|
||||||
|
@ -683,6 +686,7 @@ autoreconf -i
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
|
%patch5 -p1
|
||||||
|
|
||||||
mkdir -p daemon/m4
|
mkdir -p daemon/m4
|
||||||
|
|
||||||
|
@ -1037,8 +1041,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Jun 27 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.13-1
|
* Wed Jun 27 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.13-2
|
||||||
- New upstream version 1.19.13.
|
- New upstream version 1.19.13.
|
||||||
|
- Add upstream patch to fix GObject/Javascript tests.
|
||||||
|
|
||||||
* Tue Jun 26 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.12-1
|
* Tue Jun 26 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.19.12-1
|
||||||
- New upstream version 1.19.12.
|
- New upstream version 1.19.12.
|
||||||
|
|
Loading…
Reference in New Issue