diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-01-16 23:14:49 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-01-16 23:59:30 +0000 |
| commit | fc8a300f49e9457ada1834ae2feda738784f73c6 (patch) | |
| tree | ee9466f4226e155b919ae98f1cde60f09db4a6ed /test | |
| parent | 306c6c7751cf6953dc544a607b584a9ca58623ad (diff) | |
Testsuite: MySQL portability
Community-mysql has no mysqld-safe script, and mysqld has varying locations.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.in | 2 | ||||
| -rwxr-xr-x | test/bin/locate.sh | 27 | ||||
| -rw-r--r-- | test/scripts/2610-MySQL/2610 | 2 |
3 files changed, 19 insertions, 12 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index 546766e41..f67f8d1f5 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -27,7 +27,7 @@ all: binaries sysbinaries binaries: $(BINARIES) sysbinaries: FRC - bin/locate.sh initdb postgres pg_ctl + sh -x bin/locate.sh initdb postgres pg_ctl mysqld ls -la bin.sys # Compile and link the programs: diff --git a/test/bin/locate.sh b/test/bin/locate.sh index 19c3a5fda..95f0cea7b 100755 --- a/test/bin/locate.sh +++ b/test/bin/locate.sh @@ -3,23 +3,30 @@ [ -d bin.sys ] || mkdir bin.sys cd bin.sys -while read d +while [ $# -gt 0 ] do - if [ -x $d/$1 ] - then - while [ $# -gt 0 ] - do + while read d + do + if [ -x $d/$1 ] + then rm -f ./$1 ln -s $d/$1 . - shift - done - exit 0 - fi -done <<-HERE + break + fi + done <<-HERE /bin /usr/bin + /usr/sbin + /usr/libexec /usr/local/bin /usr/lib/postgresql/10/bin + /usr/lib/postgresql/9.5/bin + /usr/lib/postgresql/9.4/bin + /usr/lib/postgresql/9.3/bin + /usr/lib/postgresql/9.2/bin + /usr/lib/postgresql/9.1/bin /usr/lib/postgresql/9/bin HERE + shift +done diff --git a/test/scripts/2610-MySQL/2610 b/test/scripts/2610-MySQL/2610 index d160db270..5c104f3fe 100644 --- a/test/scripts/2610-MySQL/2610 +++ b/test/scripts/2610-MySQL/2610 @@ -11,7 +11,7 @@ sudo rm test-stdout test-stderr # # start a db server background -mysqld_safe --datadir=DIR/mysql --log-error=DIR/mysql/log --port=PORT_N --socket=DIR/mysql/sock --pid-file=DIR/mysql/pidfile +DIR/bin.sys/mysqld --datadir=DIR/mysql --log-error=DIR/mysql/log --bind-address=* --port=PORT_N --socket=DIR/mysql/sock --pid-file=DIR/mysql/pidfile **** # # wait for db startup, insert some data |