[gcc-7] 231/354: Update ada/confirm_debian_bugs.py for gcc-7.

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository gcc-7.

commit ecfffd54aecccb861235520eb9b9065516108168
Author: nicolas <nicolas at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Jun 28 10:42:46 2017 +0000

    Update ada/confirm_debian_bugs.py for gcc-7.
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9547 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/ada/confirm_debian_bugs.py | 32 ++++++++++++++++++++++----------
 debian/changelog                  |  4 ++++
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/debian/ada/confirm_debian_bugs.py b/debian/ada/confirm_debian_bugs.py
index 7286382..3c15a57 100644
--- a/debian/ada/confirm_debian_bugs.py
+++ b/debian/ada/confirm_debian_bugs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
 
 # Helper when migrating bugs from a gnat version to another.
 
@@ -11,13 +11,12 @@ import tempfile
 
 os.environ ['LC_ALL'] = 'C'
 
-# If == new_version, "reassign" -> "found" and "retitle" -> "fixed".
-# Once the bug tracking system is informed,
-# please update this number.
-old_version = "5"
+# If True, "reassign" -> "found" and "retitle" -> "fixed".
+# Once the bug tracking system is informed, please update this boolean.
+same_gcc_base_version = True
 
 # The current version.
-new_version = "6"
+new_version = "7"
 
 for line in subprocess.check_output (("dpkg", "--status", "gnat-" + new_version)).split ("\n"):
     if line.startswith ("Version: "):
@@ -46,7 +45,7 @@ def attempt_to_reproduce (bug, make, sources):
     return tmp_dir, status, stderr
 
 def reassign_and_remove_dir (bug, tmp_dir):
-    if old_version == new_version:
+    if same_gcc_base_version:
         print ("found {} {}".format (bug, deb_version))
     else:
         print ("reassign {} {} {}".format (bug, "gnat-" + new_version, deb_version))
@@ -59,7 +58,7 @@ def report (bug, message, output):
 
 def report_and_retitle (bug, message, output):
     report (bug, message, output)
-    if old_version == new_version:
+    if same_gcc_base_version:
         print ("fixed {} {}".format (bug, deb_version))
     else:
         print ("retitle {} [Fixed in {}] <current title>".format (bug, new_version))
@@ -819,8 +818,7 @@ end pak1;
 check_reports_an_error_but_should_not (
     bug = 427108,
     make = ("gnatmake", "test1"),
-#     regex = "FAILED",
-    regex = "Program_Error exp_disp.adb:7842 explicit raise",
+    regex = "Program_Error exp_disp.adb:7840 explicit raise",
     sources = (
         ("test1.adb", """-- "For the execution of a call on an inherited subprogram,
 -- a call on the corresponding primitive subprogram of the
@@ -962,6 +960,20 @@ begin
 end Test;
 """)))
 
+check_produces_a_faulty_executable (
+    bug = 864969,
+    make = ("gnatmake", "main"),
+    trigger = "main",
+    regex = "ZZund",
+    sources = (
+        ("main.adb", """with Ada.Locales, Ada.Text_IO;
+procedure Main is
+begin
+   Ada.Text_IO.Put_Line (String (Ada.Locales.Country)
+                       & String (Ada.Locales.Language));
+end Main;
+"""),))
+
 try:
     os.rmdir (workspace)
 except:
diff --git a/debian/changelog b/debian/changelog
index e686596..4794fe7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 gcc-7 (7.1.0-7ubuntu1) UNRELEASED; urgency=medium
 
+  [ Matthias Klose ]
   * Move the liblto_plugin from the cpp to the gcc package.
   * libstdc++6: Add more Breaks to smoothen upgrades from jessie to stretch.
     Addresses: #863845, #863745.
   * Try again building gnat on armel. See issue #861734.
   * Don't provide libobjc_gc symlinks for the libobjc multilib packages.
 
+  [ Nicolas Boulenguez ]
+  * Update ada/confirm_debian_bugs.py for gcc-7.
+
  -- Matthias Klose <doko at debian.org>  Tue, 27 Jun 2017 13:19:14 +0200
 
 gcc-7 (7.1.0-7) unstable; urgency=medium

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