From 4822cc286c8edb956bd85535e232204a85bd99aa Mon Sep 17 00:00:00 2001 From: Hadis-Fard Date: Tue, 1 Aug 2017 17:35:03 -0700 Subject: [PATCH] debugging --- .travis.yml | 2 +- Dockerfile-msphpsql | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c26bb22c..feaf6731 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ script: - docker run -e TRAVIS_JOB_ID -t -d -w $PHPSQLDIR --name=client --link $TEST_PHP_SQL_SERVER msphpsql-dev - docker ps -a - docker logs client - - docker exec client php ./test/functional/pdo_sqlsrv/*.phpt + - docker exec client php ./source/sqlsrv/run-tests.php ./test/functional/pdo_sqlsrv/*.phpt - docker exec client php ./source/sqlsrv/run-tests.php ./test/functional/sqlsrv/*.phpt - docker exec client bash -c 'for f in ./test/functional/sqlsrv/*.diff; do ls $f 2>/dev/null; cat $f 2>/dev/null; done || true' - docker exec client bash -c 'for f in ./test/functional/sqlsrv/*.out; do ls $f 2>/dev/null; cat $f 2>/dev/null; done || true' diff --git a/Dockerfile-msphpsql b/Dockerfile-msphpsql index 5f2a1bfc..377665f9 100644 --- a/Dockerfile-msphpsql +++ b/Dockerfile-msphpsql @@ -80,11 +80,11 @@ RUN sed -i -e 's/TARGET_PASSWORD/'"$TEST_PHP_SQL_PWD"'/g' MsSetup.inc WORKDIR $PHPSQLDIR RUN chmod +x ./entrypoint.sh -RUN bin/bash -c ./entrypoint.sh +RUN bin/bash -c "./entrypoint.sh" WORKDIR $PHPSQLDIR /test/functional/setup/ -RUN python ./setup_dbs.py -dbname $SQLSRV_DBNAME -RUN python ./setup_dbs.py -dbname $PDOSQLSRV_DBNAME +#RUN python ./setup_dbs.py -dbname $SQLSRV_DBNAME +#RUN python ./setup_dbs.py -dbname $PDOSQLSRV_DBNAME ENV TEST_PHP_EXECUTABLE /usr/bin/php