Repair collecting files for testresults rpm package.

Different .log files with the same name from gmp/mpfr are overwriting on copy,
put the in the separate directories.

Change-Id: I77761f1ff589252b4e8816dc12e9025d360fc5a0

diff --git a/packaging/gcc-aarch64.spec b/packaging/gcc-aarch64.spec
index de57a4a..8b48e63 100644 (file)
--- a/packaging/gcc-aarch64.spec
+++ b/packaging/gcc-aarch64.spec
@@ -819,8 +819,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %{?gcc_run_tests:
   cp `find . -name "*.sum"` ../testresults/
-  cp `find . -name "*.log"  \! -name "config.log" | grep -v 'acats.\?/tests' ` ../testresults/
-  chmod 644 ../testresults/*
+  cp --parents `find . -name "*.log"  \! -name "config.log" | grep -v 'acats.\?/tests' ` ../testresults/
+  chmod 644 `find ../testresults/ -type f`
 }
 
 %{remove_docs}
@@ -1062,7 +1062,7 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %defattr(-,root,root)
 %doc testresults/test_summary.txt
 %doc testresults/*.sum
-%doc testresults/*.log
+%doc testresults/
 }
 %ifarch x86_64
 %files -n gcc-32bit

diff --git a/packaging/gcc-armv7hl.spec b/packaging/gcc-armv7hl.spec
index c72d024..7a7e3d7 100644 (file)
--- a/packaging/gcc-armv7hl.spec
+++ b/packaging/gcc-armv7hl.spec
@@ -819,8 +819,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %{?gcc_run_tests:
   cp `find . -name "*.sum"` ../testresults/
-  cp `find . -name "*.log"  \! -name "config.log" | grep -v 'acats.\?/tests' ` ../testresults/
-  chmod 644 ../testresults/*
+  cp --parents `find . -name "*.log"  \! -name "config.log" | grep -v 'acats.\?/tests' ` ../testresults/
+  chmod 644 `find ../testresults/ -type f`
 }
 
 %{remove_docs}
@@ -1062,7 +1062,7 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %defattr(-,root,root)
 %doc testresults/test_summary.txt
 %doc testresults/*.sum
-%doc testresults/*.log
+%doc testresults/
 }
 %ifarch x86_64
 %files -n gcc-32bit

diff --git a/packaging/gcc-armv7l.spec b/packaging/gcc-armv7l.spec
index 6a8604d..83cb8ca 100644 (file)
--- a/packaging/gcc-armv7l.spec
+++ b/packaging/gcc-armv7l.spec
@@ -819,8 +819,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %{?gcc_run_tests:
   cp `find . -name "*.sum"` ../testresults/
-  cp `find . -name "*.log"  \! -name "config.log" | grep -v 'acats.\?/tests' ` ../testresults/
-  chmod 644 ../testresults/*
+  cp --parents `find . -name "*.log"  \! -name "config.log" | grep -v 'acats.\?/tests' ` ../testresults/
+  chmod 644 `find ../testresults/ -type f`
 }
 
 %{remove_docs}
@@ -1062,7 +1062,7 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %defattr(-,root,root)
 %doc testresults/test_summary.txt
 %doc testresults/*.sum
-%doc testresults/*.log
+%doc testresults/
 }
 %ifarch x86_64
 %files -n gcc-32bit

diff --git a/packaging/linaro-gcc.spec b/packaging/linaro-gcc.spec
index 3dd714e..c21edda 100644 (file)
--- a/packaging/linaro-gcc.spec
+++ b/packaging/linaro-gcc.spec
@@ -816,8 +816,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %{?gcc_run_tests:
   cp `find . -name "*.sum"` ../testresults/
-  cp `find . -name "*.log"  \! -name "config.log" | grep -v 'acats.\?/tests' ` ../testresults/
-  chmod 644 ../testresults/*
+  cp --parents `find . -name "*.log"  \! -name "config.log" | grep -v 'acats.\?/tests' ` ../testresults/
+  chmod 644 `find ../testresults/ -type f`
 }
 
 %{remove_docs}
@@ -1059,7 +1059,7 @@ mv -v libsanitizer.tar.bz %{buildroot}/src
 %defattr(-,root,root)
 %doc testresults/test_summary.txt
 %doc testresults/*.sum
-%doc testresults/*.log
+%doc testresults/
 }
 %ifarch x86_64
 %files -n gcc-32bit