| 1 |
commit: b8794f90839cb9074493a782dfd2e6f8e70e6c37 |
| 2 |
Author: Zoltan Puskas <zoltan <AT> sinustrom <DOT> info> |
| 3 |
AuthorDate: Wed Dec 26 03:58:57 2018 +0000 |
| 4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 2 18:46:53 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8794f90 |
| 7 |
|
| 8 |
sci-libs/oce: Fix failing tests |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/665596 |
| 11 |
Signed-off-by: Zoltan Puskas <zoltan <AT> sinustrom.info> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/10694 |
| 13 |
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org> |
| 14 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 15 |
|
| 16 |
sci-libs/oce/files/oce-0.18.3-test-fix.patch | 13 +++++++++++++ |
| 17 |
sci-libs/oce/{oce-0.18.3.ebuild => oce-0.18.3-r1.ebuild} | 4 +++- |
| 18 |
2 files changed, 16 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/sci-libs/oce/files/oce-0.18.3-test-fix.patch b/sci-libs/oce/files/oce-0.18.3-test-fix.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..bec55d9d36b |
| 23 |
--- /dev/null |
| 24 |
+++ b/sci-libs/oce/files/oce-0.18.3-test-fix.patch |
| 25 |
@@ -0,0 +1,13 @@ |
| 26 |
+diff --git a/test/OCAFExport_test/CMakeLists.txt b/test/OCAFExport_test/CMakeLists.txt |
| 27 |
+index f81798a3a4..8d9f6ad86c 100644 |
| 28 |
+--- a/test/OCAFExport_test/CMakeLists.txt |
| 29 |
++++ b/test/OCAFExport_test/CMakeLists.txt |
| 30 |
+@@ -5,6 +5,6 @@ if (OCE_OCAF AND NOT OCE_DISABLE_X11) |
| 31 |
+ file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../src/StdResource" BuildPluginDir) |
| 32 |
+ # Semi-colon is a delimiter in SET_TESTS_PROPERTIES and have to be escaped |
| 33 |
+ string(REPLACE ";" "\\;" BuildPluginDir "${BuildPluginDir}") |
| 34 |
+- set_tests_properties(OCAFExportTestSuite.testExportAscii PROPERTIES ENVIRONMENT "CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir}") |
| 35 |
+- set_tests_properties(OCAFExportTestSuite.testExportNonAscii PROPERTIES ENVIRONMENT "CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir}") |
| 36 |
++ set_tests_properties(OCAFExportTestSuite.testExportAscii PROPERTIES ENVIRONMENT "CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir};LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}") |
| 37 |
++ set_tests_properties(OCAFExportTestSuite.testExportNonAscii PROPERTIES ENVIRONMENT "CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir};LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}") |
| 38 |
+ endif () |
| 39 |
|
| 40 |
diff --git a/sci-libs/oce/oce-0.18.3.ebuild b/sci-libs/oce/oce-0.18.3-r1.ebuild |
| 41 |
similarity index 95% |
| 42 |
rename from sci-libs/oce/oce-0.18.3.ebuild |
| 43 |
rename to sci-libs/oce/oce-0.18.3-r1.ebuild |
| 44 |
index 69c85c7057f..0835a64d2bf 100644 |
| 45 |
--- a/sci-libs/oce/oce-0.18.3.ebuild |
| 46 |
+++ b/sci-libs/oce/oce-0.18.3-r1.ebuild |
| 47 |
@@ -1,4 +1,4 @@ |
| 48 |
-# Copyright 1999-2018 Gentoo Foundation |
| 49 |
+# Copyright 1999-2018 Gentoo Authors |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
|
| 52 |
EAPI=6 |
| 53 |
@@ -37,6 +37,8 @@ RDEPEND="${DEPEND}" |
| 54 |
CHECKREQS_MEMORY="256M" |
| 55 |
CHECKREQS_DISK_BUILD="3584M" |
| 56 |
|
| 57 |
+PATCHES=( "${FILESDIR}"/"${P}-test-fix.patch" ) |
| 58 |
+ |
| 59 |
pkg_setup() { |
| 60 |
check-reqs_pkg_setup |
| 61 |
} |
Archives