aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Elliston <bje@gnu.org>2004-02-06 23:51:47 +0000
committerBen Elliston <bje@gnu.org>2004-02-06 23:51:47 +0000
commit9b15dbbaf29172e804b722a64f60f6f0a4f2b5b6 (patch)
tree30e80dbee2c51763b4933730bf35a32ca4d36a75
parenta4a23f8e4eb5bcf4bd7e61aca783c74ceb250c56 (diff)
* util-defs.exp only exists to support testing lib/utils.exp, so move
it to the testsuite/lib directory and out of users' sight. * lib/util-defs.exp: Move from here .. * testsuite/lib/util-defs.exp: .. to here. * Makefile.am (EXTRA_DIST): Remove lib/util-defs.exp. * Makefile.in: Regenerate. * testsuite/Makefile.am (EXTRA_DIST): Add lib/util-defs.exp. * testsuite/Makefile.in: Regenerate. * doc/ref.sgml (File Map): Remove util-defs.exp. * packaging/pkg/prototype: Update file list.
-rw-r--r--ChangeLog11
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.in2
-rw-r--r--doc/ref.sgml1
-rw-r--r--packaging/pkg/prototype1
-rw-r--r--testsuite/Makefile.am3
-rw-r--r--testsuite/Makefile.in3
-rw-r--r--testsuite/lib/util-defs.exp (renamed from lib/util-defs.exp)1
8 files changed, 18 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 93e0600..6ab49fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2004-02-07 Ben Elliston <bje@wasabisystems.com>
+ * lib/util-defs.exp: Move from here ..
+ * testsuite/lib/util-defs.exp: .. to here.
+ * Makefile.am (EXTRA_DIST): Remove lib/util-defs.exp.
+ * Makefile.in: Regenerate.
+ * testsuite/Makefile.am (EXTRA_DIST): Add lib/util-defs.exp.
+ * testsuite/Makefile.in: Regenerate.
+ * doc/ref.sgml (File Map): Remove util-defs.exp.
+ * packaging/pkg/prototype: Update file list.
+
+2004-02-07 Ben Elliston <bje@wasabisystems.com>
+
* NEWS: Document changes since 1.4.4.
2004-02-07 Ben Elliston <bje@wasabisystems.com>
diff --git a/Makefile.am b/Makefile.am
index 9a7790b..37ac6e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@ pkgdata_SCRIPTS = \
lib/ftp.exp lib/kermit.exp lib/libgloss.exp lib/mondfe.exp \
lib/remote.exp lib/rlogin.exp lib/rsh.exp lib/standard.exp \
lib/target.exp lib/targetdb.exp lib/telnet.exp lib/tip.exp \
- lib/util-defs.exp lib/utils.exp lib/xsh.exp
+ lib/utils.exp lib/xsh.exp
configdir = $(pkgdatadir)/config
config_DATA = config/README
diff --git a/Makefile.in b/Makefile.in
index 63efa86..c881b8a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -190,7 +190,7 @@ pkgdata_SCRIPTS = \
lib/ftp.exp lib/kermit.exp lib/libgloss.exp lib/mondfe.exp \
lib/remote.exp lib/rlogin.exp lib/rsh.exp lib/standard.exp \
lib/target.exp lib/targetdb.exp lib/telnet.exp lib/tip.exp \
- lib/util-defs.exp lib/utils.exp lib/xsh.exp
+ lib/utils.exp lib/xsh.exp
configdir = $(pkgdatadir)/config
config_DATA = config/README
diff --git a/doc/ref.sgml b/doc/ref.sgml
index 2fa363a..f25698f 100644
--- a/doc/ref.sgml
+++ b/doc/ref.sgml
@@ -4257,7 +4257,6 @@
<listitem><para>lib/targetdb.exp</para></listitem>
<listitem><para>lib/telnet.exp</para></listitem>
<listitem><para>lib/tip.exp</para></listitem>
- <listitem><para>lib/util-defs.exp</para></listitem>
<listitem><para>lib/utils.exp</para></listitem>
<listitem><para>lib/xsh.exp</para></listitem>
<listitem><para>lib/dejagnu.exp</para></listitem>
diff --git a/packaging/pkg/prototype b/packaging/pkg/prototype
index d5de76f..970933d 100644
--- a/packaging/pkg/prototype
+++ b/packaging/pkg/prototype
@@ -124,7 +124,6 @@ f none /opt/dejagnu/share/dejagnu/target.exp 0644 nobody nobody
f none /opt/dejagnu/share/dejagnu/targetdb.exp 0644 nobody nobody
f none /opt/dejagnu/share/dejagnu/telnet.exp 0644 nobody nobody
f none /opt/dejagnu/share/dejagnu/tip.exp 0644 nobody nobody
-f none /opt/dejagnu/share/dejagnu/util-defs.exp 0644 nobody nobody
f none /opt/dejagnu/share/dejagnu/utils.exp 0644 nobody nobody
f none /opt/dejagnu/share/dejagnu/xsh.exp 0644 nobody nobody
d none /opt/dejagnu/share/dejagnu/config 0775 nobody nobody
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index ea1fbd2..814db93 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -19,7 +19,8 @@ EXTRA_DIST = \
runtest.all/config.test \
runtest.all/default_procs.tcl \
config/default.exp \
- lib/libsup.exp
+ lib/libsup.exp \
+ lib/util-defs.exp
RUNTEST = ` \
if [ -f ${top_srcdir}/runtest$(EXEEXT) ] ; then \
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 5dd77f8..2e24bc9 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -157,7 +157,8 @@ EXTRA_DIST = \
runtest.all/config.test \
runtest.all/default_procs.tcl \
config/default.exp \
- lib/libsup.exp
+ lib/libsup.exp \
+ lib/util-defs.exp
RUNTEST = ` \
if [ -f ${top_srcdir}/runtest$(EXEEXT) ] ; then \
diff --git a/lib/util-defs.exp b/testsuite/lib/util-defs.exp
index c34889f..0865861 100644
--- a/lib/util-defs.exp
+++ b/testsuite/lib/util-defs.exp
@@ -19,6 +19,7 @@
# This file was written by Rob Savoye. (rob@welcomehome.org)
+note "Hello!"
#
# Run a utility and test the result.
#