From: Miek Gieben <miekg@NLnetLabs.nl>
Date: Wed, 19 Oct 2005 12:28:46 +0000 (+0000)
Subject: portable and use arguments
X-Git-Tag: release-1.0.0~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b101d82408ba26ec03cf6edc03554e1221d99df3;p=thirdparty%2Fldns.git

portable and use arguments
---

diff --git a/test/01-compile.tpkg b/test/01-compile.tpkg
index 146372ab..b4027bda 100644
--- a/test/01-compile.tpkg
+++ b/test/01-compile.tpkg
@@ -3,8 +3,8 @@
 # To extract the files from this archive, save it to some FILE, remove
 # everything before the `!/bin/sh' line above, then type `sh FILE'.
 #
-# Made on 2005-10-19 13:50 CEST by <miekg@elektron>.
-# Source directory was `/vol/tmp/tmp.MSBEnN/test/01-compile.dir'.
+# Made on 2005-10-19 14:28 CEST by <miekg@elektron>.
+# Source directory was `/home/miekg/svn/libdns/trunk/test/01-compile.dir'.
 #
 # Existing files will *not* be overwritten unless `-c' is specified.
 #
@@ -12,7 +12,7 @@
 # length mode       name
 # ------ ---------- ------------------------------------------
 #    223 -rw------- 01-compile.dsc
-#    233 -rw------- 01-compile.test
+#    497 -rw------- 01-compile.test
 #
 save_IFS="${IFS}"
 IFS="${IFS}:"
@@ -62,7 +62,7 @@ else
 fi
 rm -f 200112312359.59 123123592001.59 123123592001.5 1231235901 $$.touch
 #
-if mkdir _sh25663; then
+if mkdir _sh01288; then
   $echo 'x -' 'creating lock directory'
 else
   $echo 'failed to create lock directory'
@@ -118,24 +118,34 @@ X
 echo $TPKG_BUILD
 cd $TPKG_BUILD
 X
-libtoolize && autoreconf && \
-X./configure && \
-make
+case $OSTYPE in
+X        linux*)
+X                libtoolize && autoreconf && \
+X                ./configure && \
+X                make
+X        ;;
+X        freebsd*)
+X                libtoolize15 && \
+X                autoconf259 && autoheader259 && \
+X                ./configure && \
+X                gmake
+X        ;;
+esac
 SHAR_EOF
-  (set 20 05 10 19 13 50 34 '01-compile.test'; eval "$shar_touch") &&
+  (set 20 05 10 19 14 27 39 '01-compile.test'; eval "$shar_touch") &&
   chmod 0600 '01-compile.test' ||
   $echo 'restore of' '01-compile.test' 'failed'
   if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
   && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
     md5sum -c << SHAR_EOF >/dev/null 2>&1 \
     || $echo '01-compile.test:' 'MD5 check failed'
-cd99b3c61412619a39926bfad27ba988  01-compile.test
+4caac3c50e70bbc82c11f7936b2fadf4  01-compile.test
 SHAR_EOF
   else
     shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < '01-compile.test'`"
-    test 233 -eq "$shar_count" ||
-    $echo '01-compile.test:' 'original size' '233,' 'current size' "$shar_count!"
+    test 497 -eq "$shar_count" ||
+    $echo '01-compile.test:' 'original size' '497,' 'current size' "$shar_count!"
   fi
 fi
-rm -fr _sh25663
+rm -fr _sh01288
 exit 0
diff --git a/test/02-lint.tpkg b/test/02-lint.tpkg
index 9f53f0ab..6b4b82c0 100644
--- a/test/02-lint.tpkg
+++ b/test/02-lint.tpkg
@@ -3,8 +3,8 @@
 # To extract the files from this archive, save it to some FILE, remove
 # everything before the `!/bin/sh' line above, then type `sh FILE'.
 #
-# Made on 2005-10-10 15:11 CEST by <miekg@floep>.
-# Source directory was `/home/miekg/svn/libdns/trunk/test/02-lint.Nb3jcO'.
+# Made on 2005-10-19 14:10 CEST by <miekg@elektron>.
+# Source directory was `/home/miekg/svn/libdns/trunk/test/02-lint.dir'.
 #
 # Existing files will *not* be overwritten unless `-c' is specified.
 #
@@ -12,7 +12,7 @@
 # length mode       name
 # ------ ---------- ------------------------------------------
 #    245 -rw------- 02-lint.dsc
-#    173 -rw------- 02-lint.test
+#    187 -rw------- 02-lint.test
 #
 save_IFS="${IFS}"
 IFS="${IFS}:"
@@ -62,7 +62,7 @@ else
 fi
 rm -f 200112312359.59 123123592001.59 123123592001.5 1231235901 $$.touch
 #
-if mkdir _sh30730; then
+if mkdir _sh00594; then
   $echo 'x -' 'creating lock directory'
 else
   $echo 'failed to create lock directory'
@@ -112,6 +112,7 @@ else
   sed 's/^X//' << 'SHAR_EOF' > '02-lint.test' &&
 [ -f ../.tpkg.var ] && source ../.tpkg.var
 X
+TPKG_BUILD=$1
 cd $TPKG_BUILD
 case $OSTYPE in
 X        linux*)
@@ -122,20 +123,20 @@ X        gmake lint
 X        ;;
 esac
 SHAR_EOF
-  (set 20 05 10 10 15 11 34 '02-lint.test'; eval "$shar_touch") &&
+  (set 20 05 10 19 14 09 38 '02-lint.test'; eval "$shar_touch") &&
   chmod 0600 '02-lint.test' ||
   $echo 'restore of' '02-lint.test' 'failed'
   if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
   && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
     md5sum -c << SHAR_EOF >/dev/null 2>&1 \
     || $echo '02-lint.test:' 'MD5 check failed'
-74ce4483d8503a1491f011e6edcb9c57  02-lint.test
+079338351bcd7a94ecfe6fd7f2e46a4b  02-lint.test
 SHAR_EOF
   else
     shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < '02-lint.test'`"
-    test 173 -eq "$shar_count" ||
-    $echo '02-lint.test:' 'original size' '173,' 'current size' "$shar_count!"
+    test 187 -eq "$shar_count" ||
+    $echo '02-lint.test:' 'original size' '187,' 'current size' "$shar_count!"
   fi
 fi
-rm -fr _sh30730
+rm -fr _sh00594
 exit 0
diff --git a/test/99-cleanup.tpkg b/test/99-cleanup.tpkg
index da2e0914..c14c6f1f 100644
--- a/test/99-cleanup.tpkg
+++ b/test/99-cleanup.tpkg
@@ -1,36 +1,135 @@
-# This is a shell archive.  Save it in a file, remove anything before
-# this line, and then unpack it by entering "sh file".  Note, it may
-# create directories; files and directories will be owned by you and
-# have default permissions.
+#!/bin/sh
+# This is a shell archive (produced by GNU sharutils 4.2.1).
+# To extract the files from this archive, save it to some FILE, remove
+# everything before the `!/bin/sh' line above, then type `sh FILE'.
 #
-# This archive contains:
+# Made on 2005-10-19 14:10 CEST by <miekg@elektron>.
+# Source directory was `/home/miekg/svn/libdns/trunk/test/99-cleanup.dir'.
 #
-#	99-cleanup.dsc
-#	99-cleanup.test
+# Existing files will *not* be overwritten unless `-c' is specified.
 #
-echo x - 99-cleanup.dsc
-sed 's/^X//' >99-cleanup.dsc << 'END-of-99-cleanup.dsc'
-XBaseName: 99-cleanup
-XVersion: 1.0
-XDescription: Cleaning up the builddir
-XCreationDate: Fri Oct  7 21:22:58 CEST 2005
-XMaintainer: Miek Gieben
-XCategory: 
-XComponent:
-XDepends: 
-XPre: 
-XPost: 
-XTest: 99-cleanup.test
-XAuxFiles: 
-XPassed:
-XFailure:
-END-of-99-cleanup.dsc
-echo x - 99-cleanup.test
-sed 's/^X//' >99-cleanup.test << 'END-of-99-cleanup.test'
-X[ -f ../.tpkg.var ] && source ../.tpkg.var
+# This shar contains:
+# length mode       name
+# ------ ---------- ------------------------------------------
+#    235 -rw------- 99-cleanup.dsc
+#     96 -rw------- 99-cleanup.test
+#
+save_IFS="${IFS}"
+IFS="${IFS}:"
+gettext_dir=FAILED
+locale_dir=FAILED
+first_param="$1"
+for dir in $PATH
+do
+  if test "$gettext_dir" = FAILED && test -f $dir/gettext \
+     && ($dir/gettext --version >/dev/null 2>&1)
+  then
+    set `$dir/gettext --version 2>&1`
+    if test "$3" = GNU
+    then
+      gettext_dir=$dir
+    fi
+  fi
+  if test "$locale_dir" = FAILED && test -f $dir/shar \
+     && ($dir/shar --print-text-domain-dir >/dev/null 2>&1)
+  then
+    locale_dir=`$dir/shar --print-text-domain-dir`
+  fi
+done
+IFS="$save_IFS"
+if test "$locale_dir" = FAILED || test "$gettext_dir" = FAILED
+then
+  echo=echo
+else
+  TEXTDOMAINDIR=$locale_dir
+  export TEXTDOMAINDIR
+  TEXTDOMAIN=sharutils
+  export TEXTDOMAIN
+  echo="$gettext_dir/gettext -s"
+fi
+if touch -am -t 200112312359.59 $$.touch >/dev/null 2>&1 && test ! -f 200112312359.59 -a -f $$.touch; then
+  shar_touch='touch -am -t $1$2$3$4$5$6.$7 "$8"'
+elif touch -am 123123592001.59 $$.touch >/dev/null 2>&1 && test ! -f 123123592001.59 -a ! -f 123123592001.5 -a -f $$.touch; then
+  shar_touch='touch -am $3$4$5$6$1$2.$7 "$8"'
+elif touch -am 1231235901 $$.touch >/dev/null 2>&1 && test ! -f 1231235901 -a -f $$.touch; then
+  shar_touch='touch -am $3$4$5$6$2 "$8"'
+else
+  shar_touch=:
+  echo
+  $echo 'WARNING: not restoring timestamps.  Consider getting and'
+  $echo "installing GNU \`touch', distributed in GNU File Utilities..."
+  echo
+fi
+rm -f 200112312359.59 123123592001.59 123123592001.5 1231235901 $$.touch
+#
+if mkdir _sh00639; then
+  $echo 'x -' 'creating lock directory'
+else
+  $echo 'failed to create lock directory'
+  exit 1
+fi
+# ============= 99-cleanup.dsc ==============
+if test -f '99-cleanup.dsc' && test "$first_param" != -c; then
+  $echo 'x -' SKIPPING '99-cleanup.dsc' '(file already exists)'
+else
+  $echo 'x -' extracting '99-cleanup.dsc' '(text)'
+  sed 's/^X//' << 'SHAR_EOF' > '99-cleanup.dsc' &&
+BaseName: 99-cleanup
+Version: 1.0
+Description: Cleaning up the builddir
+CreationDate: Fri Oct  7 21:22:58 CEST 2005
+Maintainer: Miek Gieben
+Category: 
+Component:
+Depends: 
+Pre: 
+Post: 
+Test: 99-cleanup.test
+AuxFiles: 
+Passed:
+Failure:
+SHAR_EOF
+  (set 20 05 10 19 14 10 10 '99-cleanup.dsc'; eval "$shar_touch") &&
+  chmod 0600 '99-cleanup.dsc' ||
+  $echo 'restore of' '99-cleanup.dsc' 'failed'
+  if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
+  && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
+    md5sum -c << SHAR_EOF >/dev/null 2>&1 \
+    || $echo '99-cleanup.dsc:' 'MD5 check failed'
+b1e9acaffc0b37e057b288efc1a0c7d0  99-cleanup.dsc
+SHAR_EOF
+  else
+    shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < '99-cleanup.dsc'`"
+    test 235 -eq "$shar_count" ||
+    $echo '99-cleanup.dsc:' 'original size' '235,' 'current size' "$shar_count!"
+  fi
+fi
+# ============= 99-cleanup.test ==============
+if test -f '99-cleanup.test' && test "$first_param" != -c; then
+  $echo 'x -' SKIPPING '99-cleanup.test' '(file already exists)'
+else
+  $echo 'x -' extracting '99-cleanup.test' '(text)'
+  sed 's/^X//' << 'SHAR_EOF' > '99-cleanup.test' &&
+[ -f ../.tpkg.var ] && source ../.tpkg.var
 X
-X# cleanup the mess
-Xrm -rf $TPKG_BUILD
-END-of-99-cleanup.test
-exit
-
+TPKG_BUILD=$1
+# cleanup the mess
+rm -rf $TPKG_BUILD
+SHAR_EOF
+  (set 20 05 10 19 14 10 26 '99-cleanup.test'; eval "$shar_touch") &&
+  chmod 0600 '99-cleanup.test' ||
+  $echo 'restore of' '99-cleanup.test' 'failed'
+  if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
+  && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
+    md5sum -c << SHAR_EOF >/dev/null 2>&1 \
+    || $echo '99-cleanup.test:' 'MD5 check failed'
+63ef1b5511eeb7d6160245e590266003  99-cleanup.test
+SHAR_EOF
+  else
+    shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < '99-cleanup.test'`"
+    test 96 -eq "$shar_count" ||
+    $echo '99-cleanup.test:' 'original size' '96,' 'current size' "$shar_count!"
+  fi
+fi
+rm -fr _sh00639
+exit 0