[rt19430] Script naming is now consistent.

4 files changed, 10 insertions, 6 deletions

diff --git a/tests/shell/echo.sh b/tests/shell/echo.sh
index e6000695..331ad5a6 100755
--- a/tests/shell/echo.sh
+++ b/tests/shell/echo.sh
@@ -1,2 +1,4 @@
-#!/bin/bash
-echo "reason=$reason" > ./echo.log
+#!/bin/sh
+# This very simple script. It prints out the reason passed to echo.log file.
+# This script is used in dhclient_tests.sh (and possibly other tests as well).
+echo "reason=${reason}" > ./echo.log
diff --git a/tests/shell/ip-echo b/tests/shell/ip-echo
deleted file mode 100755
index 032da192..00000000
--- a/tests/shell/ip-echo
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-echo "ip $@" >> ip-echo.log
diff --git a/tests/shell/ip-echo.sh b/tests/shell/ip-echo.sh
new file mode 100755
index 00000000..a644ed46
--- /dev/null
+++ b/tests/shell/ip-echo.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+# This very simple script pretends to be ip tool, used by linux script.
+# It is called instead of the real ip tool from iproute2 package.
+echo "ip $@" >> echo.log
diff --git a/tests/shell/linux_script_tests.sh.in b/tests/shell/linux_script_tests.sh.in
index 22d30dd1..35e02c65 100644
--- a/tests/shell/linux_script_tests.sh.in
+++ b/tests/shell/linux_script_tests.sh.in
@@ -8,9 +8,9 @@
 # This is fake ip tool. The original ip tool in Linux comes from
 # ip-route2 suite. This one is a fake one. It simply echoes all
 # its parameters to a log file.
-IP=@abs_top_builddir@/tests/shell/ip-echo
+IP=@abs_top_builddir@/tests/shell/ip-echo.sh
 
-IP_LOG_FILE=@abs_top_builddir@/tests/ip-echo.log
+IP_LOG_FILE=@abs_top_builddir@/tests/echo.log
 
 SCRIPT_FILE=@abs_top_builddir@/client/scripts/linux