diff options
| author | Ben Elliston <bje@gnu.org> | 2016-04-15 22:37:45 +1000 |
|---|---|---|
| committer | Ben Elliston <bje@gnu.org> | 2016-04-15 22:37:45 +1000 |
| commit | 02984a957cfbf4c6a248726b916205c5d28be3a1 (patch) | |
| tree | fc9d7abe9d3b51c0b1ab8dcd876340d51b053f2e | |
| parent | 1a60ad4b9993d871ab94df7788f6c00a1b95fbcc (diff) | |
| parent | 59c31dba8e52bf68ad766d43576c714c929979a6 (diff) | |
| download | dejagnu-02984a957cfbf4c6a248726b916205c5d28be3a1.zip dejagnu-02984a957cfbf4c6a248726b916205c5d28be3a1.tar.gz dejagnu-02984a957cfbf4c6a248726b916205c5d28be3a1.tar.bz2 | |
Merge master branch into dejagnu-1.6.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | Makefile.in | 6 |
3 files changed, 14 insertions, 2 deletions
@@ -1,5 +1,10 @@ 2016-04-15 Ben Elliston <bje@gnu.org> + * Makefile.am (CONTRIB): Add new contrib scripts. + * Makefile.in: Regenrate. + +2016-04-15 Ben Elliston <bje@gnu.org> + * lib/ssh.exp (ssh_exec): Handle regexp return status. 2016-04-13 Ben Elliston <bje@gnu.org> diff --git a/Makefile.am b/Makefile.am index 2573f30..604d9f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -130,7 +130,10 @@ djlibexec_SCRIPTS = config.guess # Contributed scripts, etc. -CONTRIB = contrib/compare_tests +CONTRIB = contrib/compare_tests contrib/sum2junit.sh \ + contrib/mysql/create-db.sql contrib/mysql/importxml.sh \ + contrib/mysql/make-datafile.sh contrib/mysql/plot.sh \ + contrib/mysql/README contrib/mysql/sum2xml.sh # Testsuite. diff --git a/Makefile.in b/Makefile.in index 5ffa261..5480174 100644 --- a/Makefile.in +++ b/Makefile.in @@ -465,7 +465,11 @@ djlibexecdir = $(pkgdatadir)/libexec djlibexec_SCRIPTS = config.guess # Contributed scripts, etc. -CONTRIB = contrib/compare_tests +CONTRIB = contrib/compare_tests contrib/sum2junit.sh \ + contrib/mysql/create-db.sql contrib/mysql/importxml.sh \ + contrib/mysql/make-datafile.sh contrib/mysql/plot.sh \ + contrib/mysql/README contrib/mysql/sum2xml.sh + # Testsuite. TESTSUITE_FILES = \ |