BIND 10 trac2297, updated. 462af9f5a374d7c60c8ac2b38e6d663f2af41cc3 [2297] Merge branch 'trac2297' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac2297 ommit.

[BIND 10 source code commits]

The branch, trac2297 has been updated
       via  462af9f5a374d7c60c8ac2b38e6d663f2af41cc3 (commit)
       via  30873bc3691ff9be1d9ce56dfb4c3dc30e4dabbc (commit)
      from  f48cb0979513b642ab8cea30be5a3caa10fff958 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 462af9f5a374d7c60c8ac2b38e6d663f2af41cc3
Merge: 30873bc f48cb09
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Oct 25 20:14:33 2012 -0700

    [2297] Merge branch 'trac2297' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac2297
    ommit.

commit 30873bc3691ff9be1d9ce56dfb4c3dc30e4dabbc
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Oct 25 19:55:16 2012 -0700

    [2297] introduce a filter for process_rename test to prevent false positives
    
    isc-sysinfo (now) isn't expected to be renamed, so shouldn't be tested.

-----------------------------------------------------------------------

Summary of changes:
 src/bin/tests/process_rename_test.py.in |    7 +++++++
 1 file changed, 7 insertions(+)

-----------------------------------------------------------------------
diff --git a/src/bin/tests/process_rename_test.py.in b/src/bin/tests/process_rename_test.py.in
index 1156b29..af7cc5e 100644
--- a/src/bin/tests/process_rename_test.py.in
+++ b/src/bin/tests/process_rename_test.py.in
@@ -39,6 +39,11 @@ class TestRename(unittest.TestCase):
         Then scan them by looking at the source text
         (without actually running them)
         """
+
+        # Scripts nameds contained in this list are not expected to be
+        # renamed and should be excluded from the list.
+        EXCLUDED_SCRIPTS = ['isc-sysinfo']
+
         # Regexp to find all the *_SCRIPTS = something lines (except for
         # noinst_SCRIPTS, which are scripts for tests), including line
         # continuations (backslash and newline)
@@ -59,6 +64,8 @@ class TestRename(unittest.TestCase):
                 for (var, _) in lines.findall(re.sub(excluded_lines, '',
                                                      makefile)):
                     for (script, _) in scripts.findall(var):
+                        if script in EXCLUDED_SCRIPTS:
+                            continue
                         self.__scan(d, script, fun)
 
 if __name__ == "__main__":