Skip to content

Commit 5454fe1

Browse files
sergeyklayDavertMik
authored andcommitted
Correct Windows entrypoint (codecept.bat) (Codeception#5265)
1 parent 2f70d00 commit 5454fe1

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

appveyor.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ platform: 'x86'
44
branches:
55
except:
66
- gh-pages
7-
7+
88
cache:
99
- c:\tools\php71 -> appveyor.yml
1010

@@ -27,15 +27,15 @@ install:
2727
- SET PATH=C:\Program Files\PostgreSQL\9.3\bin\;%PATH%
2828
# php setup
2929
- IF EXIST c:\tools\php71 (SET PHP=0)
30+
- ps: Set-Service wuauserv -StartupType Manual
3031
- IF %PHP%==1 cinst -y OpenSSL.Light
3132
- SET PATH=C:\Program Files\OpenSSL;%PATH%
3233
- cinst -y curl
3334
- SET PATH=C:\Program Files\curl;%PATH%
3435
- sc config wuauserv start= auto
35-
- net start wuauserv
3636
- IF %PHP%==1 cinst -y php --version 7.1.14
3737
- IF %PHP%==1 cd c:\tools\php71
38-
- IF %PHP%==1 copy php.ini-production php.ini
38+
- IF %PHP%==1 copy php.ini-production php.ini
3939
- IF %PHP%==1 echo extension_dir=ext >> php.ini
4040
- IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
4141
- IF %PHP%==1 echo date.timezone="UTC" >> php.ini
@@ -55,5 +55,5 @@ before_test:
5555
- mysql -uroot -pPassword12! -e "CREATE DATABASE codeception_test"
5656

5757
test_script:
58-
- php codecept run cli --no-colors -n --skip-group coverage
59-
- php codecept run unit -g core -g appveyor --no-colors -n
58+
- codecept run cli --no-colors -n --skip-group coverage
59+
- codecept run unit -g core -g appveyor --no-colors -n

codecept.bat

+6-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
@echo off
2-
if "%PHPBIN%" == "" set PHPBIN=@php_bin@
3-
if exist "codecept" goto INTERNAL
4-
if not exist "%PHPBIN%" if "%PHP_PEAR_PHP_BIN%" neq "" goto USE_PEAR_PATH
5-
GOTO RUN
6-
:USE_PEAR_PATH
7-
set PHPBIN=%PHP_PEAR_PHP_BIN%
8-
:RUN
9-
"%PHPBIN%" "@bin_dir@\codecept" %*
10-
:INTERNAL
11-
"%PHPBIN%" "codecept" %*
2+
3+
if "%PHP_PEAR_PHP_BIN%" neq "" (
4+
set PHPBIN=%PHP_PEAR_PHP_BIN%
5+
) else set PHPBIN=php
6+
7+
"%PHPBIN%" "codecept" %*

0 commit comments

Comments
 (0)