Skip to content

Commit 0e9d227

Browse files
authored
Merge pull request #404 from viest/dev
Test: chinese file name
2 parents 9f70406 + 8852e3d commit 0e9d227

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ build_script:
208208
#echo "@echo off" | Out-File -Encoding "ASCII" task.bat
209209
#echo "" | Out-File -Encoding "ASCII" -Append task.bat
210210
echo "" | Out-File -Encoding "ASCII" task.bat
211+
echo "php -m 2>&1" | Out-File -Encoding "ASCII" -Append task.bat
211212
echo "call git submodule update --init 2>&1" | Out-File -Encoding "ASCII" -Append task.bat
212213
echo "call phpize 2>&1" | Out-File -Encoding "ASCII" -Append task.bat
213214
$conf_cmd = 'call configure --with-xlswriter --with-extra-libs=c:\build-cache\zlib\lib --with-extra-includes=c:\build-cache\zlib\include --enable-debug-pack 2>&1'
@@ -258,7 +259,7 @@ test_script:
258259
echo "set REPORT_EXIT_STATUS=1" | Out-File -Encoding "ASCII" -Append task.bat
259260
$cmd = 'call configure --with-xlswriter --with-extra-libs=c:\build-cache\zlib\lib --with-extra-includes=c:\build-cache\zlib\include --with-prefix=c:\build-cache\' + $dname + ' 2>&1'
260261
echo $cmd | Out-File -Encoding "ASCII" -Append task.bat
261-
echo 'nmake /nologo test TESTS="-q --show-diff --set-timeout 120" 2>&1' | Out-File -Encoding "ASCII" -Append task.bat
262+
echo 'nmake /nologo test TESTS="-q --show-all --set-timeout 120" 2>&1' | Out-File -Encoding "ASCII" -Append task.bat
262263
echo "exit %errorlevel%" | Out-File -Encoding "ASCII" -Append task.bat
263264
$here = (Get-Item -Path "." -Verbose).FullName
264265
$runner = 'c:\build-cache\php-sdk-' + $env:BIN_SDK_VER + '\phpsdk' + '-' + $env:VC + '-' + $env:ARCH + '.bat'

.github/workflows/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jobs:
4141

4242
- name: Build Extension And Execute Tests
4343
run: |
44+
php -m
4445
phpize && ./configure --enable-reader
4546
make clean && make && make test
4647
@@ -49,4 +50,4 @@ jobs:
4950
run: |
5051
phpize && ./configure --enable-reader
5152
make clean && make && make test
52-
REPORT_EXIT_STATUS=1 php -n run-tests.php -m -n -d extension_dir=./modules/ -d extension=xlswriter.so -P --show-diff --set-timeout 120
53+
REPORT_EXIT_STATUS=1 php -n run-tests.php -m -n -d extension_dir=./modules/ -d extension=xlswriter.so -P --show-all --set-timeout 120

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ notifications:
2727
2828

2929
before_script:
30+
- php -m
3031
- git submodule update --init
3132
- sudo apt-get install zlib1g-dev -y
3233
- phpize && ./configure --enable-reader && make clean && make
@@ -35,7 +36,6 @@ branches:
3536
only:
3637
- master
3738
- dev
38-
- bundle
3939

4040
script:
4141
- ./travis/run-test.sh

0 commit comments

Comments
 (0)