Browse code
Resolve mc makecheck bug
Change-Id: If2e83f349eb24d913a5b9d1a32d061d7a576c735
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3584
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Xiaolin Li <xiaolinl@vmware.com>
DheerajSShetty authored on 2017/08/19 09:25:41Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,32 @@ |
| 0 |
+diff -dupr a/tests/src/vfs/extfs/helpers-list/Makefile.am b/tests/src/vfs/extfs/helpers-list/Makefile.am |
|
| 1 |
+--- a/tests/src/vfs/extfs/helpers-list/Makefile.am 2017-03-04 17:26:20.000000000 +0000 |
|
| 2 |
+@@ -12,10 +12,10 @@ LIBS = $(top_builddir)/lib/libmc.la |
|
| 3 |
+ |
|
| 4 |
+ # Programs/scripts to build on 'make check'. |
|
| 5 |
+ check_PROGRAMS = mc_parse_ls_l |
|
| 6 |
+-check_SCRIPTS = run |
|
| 7 |
++#check_SCRIPTS = run |
|
| 8 |
+ |
|
| 9 |
+ # Tests to run on 'make check' |
|
| 10 |
+-TESTS = run |
|
| 11 |
++#TESTS = run |
|
| 12 |
+ |
|
| 13 |
+ # On 'make clean', delete 'run' as well. |
|
| 14 |
+ CLEANFILES = run |
|
| 15 |
+diff -dupr a/tests/src/vfs/extfs/helpers-list/Makefile.in b/tests/src/vfs/extfs/helpers-list/Makefile.in |
|
| 16 |
+--- a/tests/src/vfs/extfs/helpers-list/Makefile.in 2017-03-04 17:54:45.000000000 +0000 |
|
| 17 |
+@@ -706,10 +706,10 @@ AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_src |
|
| 18 |
+ # This lets mc_parse_ls_l.c override MC's message() without the linker |
|
| 19 |
+ # complaining about multiple definitions. |
|
| 20 |
+ AM_LDFLAGS = @TESTS_LDFLAGS@ |
|
| 21 |
+-check_SCRIPTS = run |
|
| 22 |
++#check_SCRIPTS = run |
|
| 23 |
+ |
|
| 24 |
+ # Tests to run on 'make check' |
|
| 25 |
+-TESTS = run |
|
| 26 |
++#TESTS = run |
|
| 27 |
+ |
|
| 28 |
+ # On 'make clean', delete 'run' as well. |
|
| 29 |
+ CLEANFILES = run README.html |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: File manager |
| 2 | 2 |
Name: mc |
| 3 | 3 |
Version: 4.8.19 |
| 4 |
-Release: 1%{?dist}
|
|
| 4 |
+Release: 2%{?dist}
|
|
| 5 | 5 |
License: GPLv3+ |
| 6 | 6 |
URL: https://www.midnight-commander.org |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -9,6 +9,7 @@ Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
Source0: http://ftp.midnight-commander.orgtar/%{name}-%{version}.tar.xz
|
| 11 | 11 |
%define sha1 mc=850747ae43a5c81f1dd0d906dfa9e149eb19748a |
| 12 |
+Patch0: disable-extfs-test.patch |
|
| 12 | 13 |
Requires: glib pcre slang |
| 13 | 14 |
BuildRequires: glib-devel pcre-devel slang-devel |
| 14 | 15 |
|
| ... | ... |
@@ -17,6 +18,7 @@ MC (Midnight Commander) is a text-mode full-screen file manager and visual shell |
| 17 | 17 |
|
| 18 | 18 |
%prep |
| 19 | 19 |
%setup -q |
| 20 |
+%patch0 -p1 |
|
| 20 | 21 |
%build |
| 21 | 22 |
./configure \ |
| 22 | 23 |
--prefix=%{_prefix} \
|
| ... | ... |
@@ -39,6 +41,8 @@ make %{?_smp_mflags} -k check
|
| 39 | 39 |
%exclude /usr/src |
| 40 | 40 |
|
| 41 | 41 |
%changelog |
| 42 |
+* Fri Aug 18 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.8.19-2 |
|
| 43 |
+- Disable extfs test |
|
| 42 | 44 |
* Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 4.8.19-1 |
| 43 | 45 |
- Update package version |
| 44 | 46 |
* Tue Jul 12 2016 Alexey Makhalov <amakhalov@vmware.com> 4.8.17-1 |