[gcc-6] 85/401: * Fix running the acats tests (Svante Signell): Addresses part of #814978.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 435804893ed4e22ab8107d0e30f46c528900d121
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sat Feb 20 16:02:34 2016 +0000

      * Fix running the acats tests (Svante Signell): Addresses part of #814978.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8679 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog              | 7 ++++---
 debian/patches/ada-acats.diff | 9 +++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7fd8299..9984c2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-gcc-6 (6-20160213-1) UNRELEASED; urgency=medium
+gcc-6 (6-20160220-1) UNRELEASED; urgency=medium
 
-  * GCC 6 snapshot build, taken from the trunk 20160213.
+  * GCC 6 snapshot build, taken from the trunk 20160220.
     - Fix PR tree-optimization/68021. Closes: #812245.
     - Fix PR ipa/69241. Closes: #812060.
     - Fix PR libstdc++/56158. Closes: #789369.
@@ -8,8 +8,9 @@ gcc-6 (6-20160213-1) UNRELEASED; urgency=medium
   * libgccjit-6-doc: Really conflict with libgccjit-5-doc. Closes: #814527.
   * Update conflict for gnat cross build packages. Closes: #810809.
   * Disable the m68k gnat build, currently fails. See: #814221.
+  * Fix running the acats tests (Svante Signell): Addresses part of #814978.
 
- -- Matthias Klose <doko at debian.org>  Thu, 11 Feb 2016 22:36:28 +0100
+ -- Matthias Klose <doko at debian.org>  Sat, 20 Feb 2016 16:58:47 +0100
 
 gcc-6 (6-20160205-1) experimental; urgency=medium
 
diff --git a/debian/patches/ada-acats.diff b/debian/patches/ada-acats.diff
index e88a100..83b9acf 100644
--- a/debian/patches/ada-acats.diff
+++ b/debian/patches/ada-acats.diff
@@ -120,6 +120,15 @@ Index: b/src/gcc/testsuite/ada/acats/run_all.sh
  display ""
  
  if [ -n "$GCC_RUNTEST_PARALLELIZE_DIR" ]; then
+@@ -129,7 +136,7 @@ cp $testdir/support/*.ada $testdir/suppo
+ # Find out the size in bit of an address on the target
+ target_gnatmake $testdir/support/impbit.adb >> $dir/acats.log 2>&1
+ target_run $dir/support/impbit > $dir/support/impbit.out 2>&1
+-target_bit=`cat $dir/support/impbit.out`
++target_bit=`cat $dir/support/impbit.out` | sed -e 's/\r//g'
+ echo target_bit="$target_bit" >> $dir/acats.log
+ 
+ # Find out a suitable asm statement
 Index: b/src/gcc/testsuite/lib/gnat.exp
 ===================================================================
 --- a/src/gcc/testsuite/lib/gnat.exp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git