[exim-cvs] Testsuite: hunt harder for more DB utility binari…

Gitweb: https://git.exim.org/exim.git/commitdiff/7a7d145e80c7186e811628c0dea8f6afc26b73ff

Commit:     7a7d145e80c7186e811628c0dea8f6afc26b73ff
Parent:     be66e4b692534372a27df6a7f47f403352335bad
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Sep 3 14:56:56 2023 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sun Sep 3 14:56:56 2023 +0100

    Testsuite: hunt harder for more DB utility binaries
---
 test/Makefile.in                  |  2 +-
 test/scripts/2610-MySQL/2610      | 12 ++++++------
 test/scripts/2620-Postgresql/2620 |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/Makefile.in b/test/Makefile.in
index abfdcb8a7..dfa67bd38 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -28,7 +28,7 @@ all:            binaries sysbinaries
 binaries:    $(BINARIES)

 sysbinaries:    FORCE binaries
-        bin/locate initdb postgres pg_ctl mysqld
+        bin/locate initdb postgres pg_ctl psql mysqld mysql
         ls -la bin.sys

 # Compile and link the programs:
diff --git a/test/scripts/2610-MySQL/2610 b/test/scripts/2610-MySQL/2610
index ba4a67bb0..91a3f6be3 100644
--- a/test/scripts/2610-MySQL/2610
+++ b/test/scripts/2610-MySQL/2610
@@ -19,7 +19,7 @@ DIR/bin.sys/mysqld --datadir=DIR/mysql --log-error=DIR/mysql/log --bind-address=
 ### wait for db startup, set password on the root user
 echo Waiting for DB server startup
 sudo perl
-system 'mysql --protocol=socket --socket=`pwd`/mysql/sock --connect_timeout=10 -u root -e "set password = password(\"pass\")"';
+system 'DIR/bin.sys/mysql --protocol=socket --socket=`pwd`/mysql/sock --connect_timeout=10 -u root -e "set password = password(\"pass\")"';
 ****
 #
 ### create testdb and extra users
@@ -27,15 +27,15 @@ echo Create testdb and extra users
 perl
 system 'mysqladmin --protocol=TCP -P PORT_N -u root -ppass create test';
 my $fh;
-open($fh, '-|', 'mysql --protocol=TCP -P PORT_N -u root -ppass -D test -e "select 1 from mysql.user where User = \'root\' and Host = \'HOSTIPV4\'"');
+open($fh, '-|', 'DIR/bin.sys/mysql --protocol=TCP -P PORT_N -u root -ppass -D test -e "select 1 from mysql.user where User = \'root\' and Host = \'HOSTIPV4\'"');
 my $line = <$fh>;
 if (length($line) == 0) {
-  system 'mysql --protocol=TCP -P PORT_N -u root -ppass -D test -e "create user \'root\'@\'HOSTIPV4\'"';
+  system 'DIR/bin.sys/mysql --protocol=TCP -P PORT_N -u root -ppass -D test -e "create user \'root\'@\'HOSTIPV4\'"';
 }
-open($fh, '-|', 'mysql --protocol=TCP -P PORT_N -u root -ppass -D test -e "select 1 from mysql.user where User = \'CALLER\' and Host = \'HOSTIPV4\'"');
+open($fh, '-|', 'DIR/bin.sys/mysql --protocol=TCP -P PORT_N -u root -ppass -D test -e "select 1 from mysql.user where User = \'CALLER\' and Host = \'HOSTIPV4\'"');
 $line = <$fh>;
 if (length($line) == 0) {
-  system 'mysql --protocol=TCP -P PORT_N -u root -ppass -D test -e "create user \'CALLER\'@\'HOSTIPV4\'"';
+  system 'DIR/bin.sys/mysql --protocol=TCP -P PORT_N -u root -ppass -D test -e "create user \'CALLER\'@\'HOSTIPV4\'"';
 }
 ****
 #
@@ -43,7 +43,7 @@ if (length($line) == 0) {
 # wait for db startup, insert some data
 echo Insert some data
 perl
-system 'mysql --protocol=TCP -P PORT_N -u root -ppass -D test \
+system 'DIR/bin.sys/mysql --protocol=TCP -P PORT_N -u root -ppass -D test \
  -e "CREATE TABLE them ( name text, id text ); \
      INSERT INTO them VALUES ( \'Philip Hazel\', \'ph10\' ); \
      INSERT INTO them VALUES ( \'Aristotle\',    \'aaaa\' ); \
diff --git a/test/scripts/2620-Postgresql/2620 b/test/scripts/2620-Postgresql/2620
index 149413af6..bad032b30 100644
--- a/test/scripts/2620-Postgresql/2620
+++ b/test/scripts/2620-Postgresql/2620
@@ -22,7 +22,7 @@ echo Waiting for DB server
 perl
 system 'DIR/bin.sys/pg_ctl -w -D DIR/pgsql/data status';
 system 'createdb -h localhost -p PORT_N test';
-system 'psql -h localhost -p PORT_N -d test \
+system 'DIR/bin.sys/psql -h localhost -p PORT_N -d test \
  -c "CREATE TABLE them ( name text, id text ); \
      INSERT INTO them VALUES ( \'Philip Hazel\', \'ph10\' ); \
      INSERT INTO them VALUES ( \'Aristotle\',    \'aaaa\' ); \

--
## subscription configuration (requires account):
## https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/