From 707847b46e38dea64feec332c45f3fe247994666 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 17 Oct 2016 10:12:19 +0100 Subject: [PATCH 1/2] Shell-based CI with lint scans --- .travis.yml | 2 +- tests/lint.sh | 8 ++++++++ tests/run.sh | 8 ++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100755 tests/lint.sh create mode 100755 tests/run.sh diff --git a/.travis.yml b/.travis.yml index b0e238cd7..32152c3a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ before_script: - echo | pecl install channel://pecl.php.net/yaml-2.0.0RC7 script: - - php tests/TravisTest.php + - ./tests/lint.sh && ./tests/run.sh notifications: email: false diff --git a/tests/lint.sh b/tests/lint.sh new file mode 100755 index 000000000..a2aa579a1 --- /dev/null +++ b/tests/lint.sh @@ -0,0 +1,8 @@ +#!/bin/bash +echo Running PHP lint scans... +shopt -s globstar +for file in src/pocketmine/*.php src/pocketmine/**/*.php; do + OUTPUT=`php -l "$file"` + [ $? -ne 0 ] && echo -n "$OUTPUT" && exit 1 +done +echo Lint scan completed successfully. \ No newline at end of file diff --git a/tests/run.sh b/tests/run.sh new file mode 100755 index 000000000..24858a03b --- /dev/null +++ b/tests/run.sh @@ -0,0 +1,8 @@ +#!/bin/bash +echo -e "version\nmakeserver\nstop\n" | php src/pocketmine/PocketMine.php --no-wizard --disable-ansi +if ls plugins/DevTools/PocketMine*.phar >/dev/null 2>&1; then + echo Server phar created successfully. +else + echo No phar created! + exit 1 +fi \ No newline at end of file From 10698c892e85235694adb0c674f4f5a36a4b5187 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 18 Oct 2016 12:45:56 +0100 Subject: [PATCH 2/2] Remove old script, add disable-readline option --- tests/TravisTest.php | 49 -------------------------------------------- tests/run.sh | 2 +- 2 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 tests/TravisTest.php diff --git a/tests/TravisTest.php b/tests/TravisTest.php deleted file mode 100644 index b561eab16..000000000 --- a/tests/TravisTest.php +++ /dev/null @@ -1,49 +0,0 @@ - ["pipe", "r"], - 1 => ["pipe", "w"], - 2 => ["pipe", "w"] -], $pipes); - -if(!is_resource($server)){ - die('Failed to create process'); -} - -fwrite($pipes[0], "version\nmakeserver\nstop\n\n"); -fclose($pipes[0]); - -while(!feof($pipes[1])){ - echo fgets($pipes[1]); -} - -fclose($pipes[1]); -fclose($pipes[2]); - -echo "\n\nReturn value: ". proc_close($server) ."\n"; - -if(count(glob("plugins/DevTools/PocketMine-MP*.phar")) === 0){ - echo "No server Phar created!\n"; - exit(1); -}else{ - exit(0); -} diff --git a/tests/run.sh b/tests/run.sh index 24858a03b..cada237fc 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -echo -e "version\nmakeserver\nstop\n" | php src/pocketmine/PocketMine.php --no-wizard --disable-ansi +echo -e "version\nmakeserver\nstop\n" | php src/pocketmine/PocketMine.php --no-wizard --disable-ansi --disable-readline if ls plugins/DevTools/PocketMine*.phar >/dev/null 2>&1; then echo Server phar created successfully. else