Skip to content

Commit

Permalink
mysqlがserviceに追加されていたのでそちらを使うように修正
Browse files Browse the repository at this point in the history
  • Loading branch information
nobuhiko committed Mar 25, 2015
1 parent 7b202a5 commit c11a25f
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
25 changes: 11 additions & 14 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,26 @@ environment:
global:
USER: "root"
DBNAME: "myapp_test"
DBPASS: " "
DBPASS: "Password12!"
DBUSER: "root"
matrix:
- db: mysql
provider: mysql

services:
- iis
- mysql

# Install scripts. (runs after repo cloning)
install:
# Set MySQL.
- cp tests/my.cnf c:\
- cinst mysql
- SET PATH=C:\tools\mysql\current\bin\;%PATH%
# Set bash.
#- cinst mingw-get
#- set PATH=%PATH%;C:\MinGW\msys\1.0\bin;C:\MinGW\bin
#- mingw-get install mingw-developer-toolkit
## Set PHP.
- SET PATH=C:\Program Files\MySql\MySQL Server 5.6\bin\;%PATH%
#- cinst mysql
#- SET PATH=C:\tools\mysql\current\bin\;%PATH%
# Set PHP.
- cinst php
- SET PATH=C:\tools\php\;%PATH%
#- cd C:\tools\php
- copy C:\tools\php\php.ini-production C:\tools\php\php.ini
- echo date.timezone="Asia/Tokyo" >> C:\tools\php\php.ini
- echo extension_dir=ext >> C:\tools\php\php.ini
Expand All @@ -43,7 +40,7 @@ install:
- echo extension=php_mbstring.dll >> C:\tools\php\php.ini
- echo extension=php_mysql.dll >> C:\tools\php\php.ini
- echo extension=php_pgsql.dll >> C:\tools\php\php.ini
- echo extension=php_pdo.dll >> C:\tools\php\php.ini
#- echo extension=php_pdo.dll >> C:\tools\php\php.ini
- echo extension=php_pdo_mysql.dll >> C:\tools\php\php.ini
- echo extension=php_pdo_pgsql.dll >> C:\tools\php\php.ini
- echo extension=php_curl.dll >> C:\tools\php\php.ini
Expand All @@ -54,9 +51,10 @@ install:
- echo mbstring.http_input = UTF-8 >> C:\tools\php\php.ini
- echo mbstring.http_output = pass >> C:\tools\php\php.ini
- echo mbstring.internal_encoding = UTF-8 >> C:\tools\php\php.ini
#- cd C:\projects\ec-cube
#- php -r "readfile('https://getcomposer.org/installer');" | php
#- php composer.phar install

cache:
- C:\ProgramData\chocolatey\bin -> appveyor.yml
- C:\ProgramData\chocolatey\lib -> appveyor.yml

# Don't actually build.
build: off
Expand All @@ -65,5 +63,4 @@ before_test:
- bash eccube_install.sh mysql

test_script:
#- php -i
- vendor\bin\phpunit.bat
17 changes: 10 additions & 7 deletions tests/my.cnf
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
[client]
default-character-set=utf8
[mysqld]
#default-character-set=utf8
character-set-server = utf8
skip-character-set-client-handshake
#collation-server = utf8_general_ci
#max_prepared_stmt_count=2000000
character-set-server = utf8
collation-server = utf8_general_ci
init-connect = SET NAMES utf8

[client]
#default-character-set=utf8
#character-set-server = utf8
[mysqldump]
default-character-set=utf8

[mysql]
default-character-set=utf8

0 comments on commit c11a25f

Please sign in to comment.