Module Name:    src
Committed By:   ozaki-r
Date:           Wed Dec 21 07:02:16 UTC 2016

Modified Files:
        src/tests/net/ndp: t_ra.sh

Log Message:
Restore multiple_routers_single_prefix_cleanup removed wrongly


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/tests/net/ndp/t_ra.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/net/ndp/t_ra.sh
diff -u src/tests/net/ndp/t_ra.sh:1.16 src/tests/net/ndp/t_ra.sh:1.17
--- src/tests/net/ndp/t_ra.sh:1.16	Tue Dec 20 10:12:24 2016
+++ src/tests/net/ndp/t_ra.sh	Wed Dec 21 07:02:16 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: t_ra.sh,v 1.16 2016/12/20 10:12:24 ozaki-r Exp $
+#	$NetBSD: t_ra.sh,v 1.17 2016/12/21 07:02:16 ozaki-r Exp $
 #
 # Copyright (c) 2015 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -494,6 +494,22 @@ ra_multiple_routers_single_prefix_body()
 	rump_server_destroy_ifaces
 }
 
+multiple_routers_single_prefix_cleanup()
+{
+
+	if [ -f ${PIDFILE} ]; then
+		kill -TERM `cat ${PIDFILE}`
+		wait_term ${PIDFILE}
+	fi
+	if [ -f ${PIDFILE1_2} ]; then
+		kill -TERM `cat ${PIDFILE1_2}`
+		wait_term ${PIDFILE1_2}
+	fi
+
+	$DEBUG && dump
+	cleanup
+}
+
 atf_test_case ra_multiple_routers_maxifprefixes cleanup
 ra_multiple_routers_maxifprefixes_head()
 {

Reply via email to