From 83dd8d3718dfea41d674ad58b89a7eef46b85404 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Nov 23 2018 03:57:26 +0000 Subject: Actually run the tests (but not the GUI ones, yet) --- diff --git a/fix-filename-test.patch b/fix-filename-test.patch new file mode 100644 index 0000000..2f5dfcc --- /dev/null +++ b/fix-filename-test.patch @@ -0,0 +1,13 @@ +diff -up wxWidgets-3.0.4/tests/filename/filenametest.cpp.fix_fntest wxWidgets-3.0.4/tests/filename/filenametest.cpp +--- wxWidgets-3.0.4/tests/filename/filenametest.cpp.fix_fntest 2018-03-07 11:55:38.000000000 -0500 ++++ wxWidgets-3.0.4/tests/filename/filenametest.cpp 2018-11-22 11:58:40.099232797 -0500 +@@ -766,8 +766,7 @@ void FileNameTestCase::TestExists() + #ifdef __LINUX__ + // These files are only guaranteed to exist under Linux. + // No need for wxFILE_EXISTS_NO_FOLLOW here; wxFILE_EXISTS_SYMLINK implies it +- CPPUNIT_ASSERT( wxFileName::Exists("/dev/core", wxFILE_EXISTS_SYMLINK) ); +- CPPUNIT_ASSERT( wxFileName::Exists("/dev/log", wxFILE_EXISTS_SOCKET) ); ++ CPPUNIT_ASSERT( wxFileName::Exists("/proc/self", wxFILE_EXISTS_SYMLINK) ); + #endif // __LINUX__ + #ifndef __VMS + wxString fifo = dirTemp.GetPath() + "/fifo"; diff --git a/fix-vararg-test.patch b/fix-vararg-test.patch new file mode 100644 index 0000000..05c0135 --- /dev/null +++ b/fix-vararg-test.patch @@ -0,0 +1,31 @@ +From be5d3b5bca0eca2b7db75037ae21bb002d50c60b Mon Sep 17 00:00:00 2001 +From: Lauri Nurmi +Date: Thu, 16 Jun 2016 01:05:06 +0300 +Subject: [PATCH] Fix unit test when char is unsigned by default + +Skip test relying on char being signed if it isn't by default, as is the case +with gcc on some ARM platforms, for example. + +Closes https://github.com/wxWidgets/wxWidgets/pull/299 +--- + tests/strings/vararg.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/strings/vararg.cpp b/tests/strings/vararg.cpp +index 0e3cc84ac9..9c93652b9f 100644 +--- a/tests/strings/vararg.cpp ++++ b/tests/strings/vararg.cpp +@@ -132,8 +132,10 @@ void VarArgTestCase::CharPrintf() + #pragma warning(default:4305) // truncation of constant value in VC6 + #pragma warning(default:4309) + #endif ++ #ifndef __CHAR_UNSIGNED__ + s.Printf("value is %i (int)", c); + CPPUNIT_ASSERT_EQUAL( wxString("value is -16 (int)"), s ); ++ #endif + + unsigned char u = 240; + s.Printf("value is %i (int)", u); +-- +2.19.1 + diff --git a/wxGTK3.spec b/wxGTK3.spec index bc57eb2..8c2e41b 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -36,6 +36,8 @@ Source10: wx-config # remove abort when ABI check fails # Backport from wxGTK Patch0: %{name}-3.0.3-abicheck.patch +Patch1: fix-filename-test.patch +Patch2: fix-vararg-test.patch BuildRequires: gcc-c++ BuildRequires: gtk2-devel @@ -341,17 +343,14 @@ mv %{buildroot}%{_datadir}/bakefile/presets/*.* %{buildroot}%{_datadir}/bakefile cat wxmsw3.lang >> wxstd3.lang %check -# TODO: eventually actually run the tests instead of just compiling them -pushd %{gtk2dir} -pushd tests -make %{?_smp_mflags} test -popd +pushd %{gtk2dir}/tests +make %{?_smp_mflags} +LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./test popd -pushd %{gtk3dir} -pushd tests -make %{?_smp_mflags} test -popd +pushd %{gtk3dir}/tests +make %{?_smp_mflags} +LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./test popd %post -n %{wxbasename}-devel @@ -458,6 +457,7 @@ fi - Remove Group tags - Remove xmldocs subpackage (never used) - Remove cppunit workaround (no longer needed) +- Actually run the tests (but not the GUI ones, yet) * Sat Jul 14 2018 Fedora Release Engineering - 3.0.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild