[Initscripts-ng-commits] r317 - in /trunk/src/insserv/debian: changelog rules run-testsuite

[pere at users.alioth.debian.org]

Author: pere
Date: Sat Dec 29 14:46:42 2007
New Revision: 317

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=317
Log:
  * Add script debian/run-testsuite to test the generated order, and
    use it during build.

Added:
    trunk/src/insserv/debian/run-testsuite   (with props)
Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/rules

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=317&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sat Dec 29 14:46:42 2007
@@ -7,6 +7,8 @@
     stop levels.  (Closes: #452462).
   * New patch 44_path_at_runtime to add new option -p to make it
     possible to replace /etc/init.d with another path for testing.
+  * Add script debian/run-testsuite to test the generated order, and
+    use it during build.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 29 Dec 2007 00:20:04 +0100
 

Modified: trunk/src/insserv/debian/rules
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/rules?rev=317&op=diff
==============================================================================
--- trunk/src/insserv/debian/rules (original)
+++ trunk/src/insserv/debian/rules Sat Dec 29 14:46:42 2007
@@ -32,6 +32,8 @@
 
 	# Add here commands to compile the package.
 	$(MAKE) COPTS="$(CFLAGS)"
+
+	debian/run-testsuite
 
 	touch build-stamp
 

Added: trunk/src/insserv/debian/run-testsuite
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/run-testsuite?rev=317&op=file
==============================================================================
--- trunk/src/insserv/debian/run-testsuite (added)
+++ trunk/src/insserv/debian/run-testsuite Sat Dec 29 14:46:42 2007
@@ -1,0 +1,168 @@
+#!/bin/sh
+
+tmpdir=`pwd`/testdir
+initddir=$tmpdir/init.d
+
+insserv=`pwd`/insserv
+
+retval=0
+
+mkdir -p $initddir
+
+#debug="-v"
+
+insertscript() {
+    script=$initddir/$1
+    cat > $script
+    chmod a+rx $script
+    $insserv $debug -p $initddir $script
+}
+
+check_order() {
+    runlevel=$1
+    script1=$2
+    script2=$3
+    order="$(echo $(cd $tmpdir/rc$runlevel.d/; ls *$script1 *$script2 |sed 's/S..//') )"
+    if [ "$order" != "$script1 $script2" ] ; then
+	echo "error: Incorrect sequence $script1 not before $script2: $order"
+	retval=1
+    fi
+}
+
+insertscript reboot <<EOF
+### BEGIN INIT INFO
+# Provides:          reboot
+# Required-Start:
+# Required-Stop:
+# Default-Start:
+# Default-Stop:      6
+### END INIT INFO
+EOF
+
+insertscript mountkernfs.sh <<EOF
+### BEGIN INIT INFO
+# Provides:          mountkernfs
+# Required-Start:
+# Required-Stop:
+# Should-Start:      glibc
+# Default-Start:     S
+# Default-Stop:
+### END INIT INFO
+EOF
+
+insertscript mountdevsubfs.sh <<EOF
+### BEGIN INIT INFO
+# Provides:          mountdevsubfs mountvirtfs
+# Required-Start:    mountkernfs
+# Required-Stop:
+# Should-Start:      udev
+# Default-Start:     S
+# Default-Stop:
+### END INIT INFO
+EOF
+
+insertscript checkroot.sh <<EOF
+### BEGIN INIT INFO
+# Provides:          checkroot
+# Required-Start:    mountdevsubfs
+# Required-Stop:
+# Should-Start:      keymap hwclockfirst
+# Should-stop:
+# Default-Start:     S
+# Default-Stop:
+### END INIT INFO
+EOF
+
+insertscript ifupdown-clean <<EOF
+### BEGIN INIT INFO
+# Provides:          ifupdown-clean
+# Required-Start:    checkroot
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:
+### END INIT INFO
+EOF
+
+insertscript ifupdown <<EOF
+### BEGIN INIT INFO
+# Provides:          ifupdown
+# Required-Start:    ifupdown-clean
+# Required-Stop:     $local_fs
+# Default-Start:     S
+# Default-Stop:      0 6
+### END INIT INFO
+EOF
+
+insertscript checkroot.sh <<EOF
+### BEGIN INIT INFO
+# Provides:          checkroot
+# Required-Start:    mountdevsubfs
+# Required-Stop:
+# Should-Start:      keymap hwclockfirst
+# Should-stop:
+# Default-Start:     S
+# Default-Stop:
+### END INIT INFO
+EOF
+
+insertscript checkfs.sh <<EOF
+### BEGIN INIT INFO
+# Provides:          checkfs
+# Required-Start:    checkroot
+# Required-Stop:
+# Should-Start:      lvm cryptdisks
+# Should-Stop:
+# Default-Start:     S
+# Default-Stop:
+### END INIT INFO
+EOF
+
+insertscript mountall.sh <<EOF
+### BEGIN INIT INFO
+# Provides:          mountall
+# Required-Start:    checkfs
+# Required-Stop:
+# Should-Start:      lvm
+# Should-Stop:
+# Default-Start:     S
+# Default-Stop:
+### END INIT INFO
+EOF
+
+insertscript mountnfs.sh <<EOF
+### BEGIN INIT INFO
+# Provides:          mountnfs
+# Required-Start:    $local_fs
+# Required-Stop:
+# Should-Start:      $network
+# Default-Start:     S
+# Default-Stop:
+### END INIT INFO
+EOF
+
+insertscript daemon <<EOF
+#### BEGIN INIT INFO
+# Provides:          daemon
+# Required-Start:    $remote_fs
+# Required-Stop:     $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+### END INIT INFO
+EOF
+
+insertscript nolsbheader <<EOF
+EOF
+
+check_order S mountkernfs.sh mountdevsubfs.sh
+check_order S ifupdown-clean ifupdown
+check_order S ifupdown-clean ifupdown
+check_order S mountall.sh mountnfs.sh
+
+(cd $tmpdir && ls *)
+
+rm -rf $tmpdir
+
+if [ 0 != $retval ] ; then
+    echo "error: One or more test failed."
+fi
+exit $retval

Propchange: trunk/src/insserv/debian/run-testsuite
------------------------------------------------------------------------------
    svn:executable = *