version 3 for common.sh

git-svn-id: file:///svn/unbound/trunk@2395 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 642a3584de1ebabe045581cc166c904866b3f821..1930e578a157d0505b84c3a2b9a3e3bf44a7581d 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 23 February 2011: Wouter
        - iana portlist updated.
+       - common.sh to version 3.
 
 18 February 2011: Wouter
        - common.sh in testdata updated to version 2.

diff --git a/testdata/common.sh b/testdata/common.sh
index 7542ef6aed25df33a3fcfbd9fbb3040aa49fa125..8e3b2293ec671cd75ed013f8a41ddec80cf24b04 100644 (file)
--- a/testdata/common.sh
+++ b/testdata/common.sh
@@ -1,7 +1,8 @@
 # common.sh - an include file for commonly used functions for test code.
 # BSD licensed (see LICENSE file).
 #
-# Version 2
+# Version 3
+# 2011-02-23: get_pcat for PCAT, PCAT_DIFF and PCAT_PRINT defines.
 # 2011-02-18: ports check on BSD,Solaris. wait_nsd_up.
 # 2011-02-11: first version.
 #
@@ -14,7 +15,8 @@
 # test_tool_avail x    : see if program in path and complain, exit if not.
 # get_ldns_testns      : set LDNS_TESTNS to executable ldns-testns
 # get_make             : set MAKE to gmake or make tool.
-# get_gcc              : get cc or gcc in CC
+# get_gcc              : set cc or gcc in CC
+# get_pcat             : set PCAT, PCAT_DIFF and PCAT_PRINT executables.
 # set_doxygen_path     : set doxygen path
 # skip_if_in_list      : set SKIP=1 if name in list and tool not available.
 # get_random_port x    : get RND_PORT a sequence of free random port numbers.
@@ -78,6 +80,13 @@ get_gcc () {
        fi
 }
 
+# get pcat, pcat-print and pcat-diff
+get_pcat () {
+       PCAT=`which pcat`
+       PCAT_PRINT=`which pcat-print`
+       PCAT_DIFF=`which pcat-diff`
+}
+
 # set SKIP=1 if the name is in list and tool is not available.
 # $1: name of package to check.
 # $2: list of packages that need the tool.