BIND 10 trac558, updated. fcf3cdd41a35c9c96e95272bc5d817b0457ab8dc [trac558] Remove local message file from test directory

[BIND 10 source code commits]

The branch, trac558 has been updated
       via  fcf3cdd41a35c9c96e95272bc5d817b0457ab8dc (commit)
      from  bf5f7b5f56ed649f78206fa2c3b4f9acdee1e310 (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 fcf3cdd41a35c9c96e95272bc5d817b0457ab8dc
Author: Stephen Morris <stephen at isc.org>
Date:   Tue Feb 8 11:15:56 2011 +0000

    [trac558] Remove local message file from test directory
    
    The last fix (adding EXTRA_DIST to the test Makefile.am to include
    localdef.mes) did not work.  Rather than chase up why, localdef.mes
    is removed from the distribution, instead the contents are created
    at test time by the script run_time_init_test.sh

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

Summary of changes:
 src/lib/log/tests/Makefile.am              |    2 --
 src/lib/log/tests/localdef.mes             |   23 -----------------------
 src/lib/log/tests/run_time_init_test.sh.in |   10 ++++++++++
 3 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 src/lib/log/tests/localdef.mes

-----------------------------------------------------------------------
diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am
index 93ac193..8589501 100644
--- a/src/lib/log/tests/Makefile.am
+++ b/src/lib/log/tests/Makefile.am
@@ -33,8 +33,6 @@ run_unittests_LDADD  = $(GTEST_LDADD)
 run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
 endif
 
-EXTRA_DIST=localdef.mes
-
 TESTS += logger_support_test
 logger_support_test_SOURCES = logger_support_test.cc
 logger_support_test_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
diff --git a/src/lib/log/tests/localdef.mes b/src/lib/log/tests/localdef.mes
deleted file mode 100644
index 98e197d..0000000
--- a/src/lib/log/tests/localdef.mes
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-# \brief Local Definitions
-#
-# Holds local definitions of some of the messages produced by the program
-# logger_support_test, and is used as input to check that run-time message
-# replacement works.
-
-NOTHERE     this message is not in the global dictionary
-READERR     replacement read error, parameters: '%s' and '%s'
-UNRECDIR    replacement unrecognised directive message, parameter is '%s'
diff --git a/src/lib/log/tests/run_time_init_test.sh.in b/src/lib/log/tests/run_time_init_test.sh.in
index 1ef8a0f..68e42da 100755
--- a/src/lib/log/tests/run_time_init_test.sh.in
+++ b/src/lib/log/tests/run_time_init_test.sh.in
@@ -26,6 +26,15 @@ passfail() {
     fi
     failcount=`expr $failcount + $1`
 }
+
+# Create the local message file for testing
+
+cat > $localmes << .
+NOTHERE     this message is not in the global dictionary
+READERR     replacement read error, parameters: '%s' and '%s'
+UNRECDIR    replacement unrecognised directive message, parameter is '%s'
+.
+
     
 echo -n "1. runInitTest default parameters: "
 cat > $tempfile << .
@@ -69,6 +78,7 @@ INFO  [alpha.dlm] OPENIN, unable to open message file example.msg for input: dum
 ./logger_support_test $localmes | cut -d' ' -f3- | diff $tempfile -
 passfail $?
 
+rm -f $localmes
 rm -f $tempfile
 
 if [ $failcount -eq 0 ]; then