Merge branch 'develop-olympus' into develop · upspace/phpbb3@0ce899c · GitHub

upspace / phpbb3 Public

forked from phpbb/phpbb

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 0ce899c

Browse filesBrowse the repository at this point in the historyBrowse files

bantu

committed

Merge branch 'develop-olympus' into develop

* develop-olympus: [ticket/10723] Stop Travis running all tests on sqlite

2 parents fb51bc4 + 9c85c6c commit 0ce899c
Copy full SHA for 0ce899c

2 files changed

+14-14Lines changed: 14 additions & 14 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• travis
  • phpunit-mysql-travis.xml
  • phpunit-postgres-travis.xml

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎travis/phpunit-mysql-travis.xml‎

Copy file name to clipboardExpand all lines: travis/phpunit-mysql-travis.xml

+7-7Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
@@ -23,12 +23,12 @@
23	23	</groups>
24	24
25	25	<php>
26		- <const name="dbms" value="mysqli"/>
27		- <const name="dbhost" value="0.0.0.0" />
28		- <const name="dbport" value="3306" />
29		- <const name="dbname" value="phpbb_tests" />
30		- <const name="dbuser" value="root" />
31		- <const name="dbpasswd" value="" />
32		- <const name="table_prefix" value="phpbb_"/>
	26	+ <server name="PHPBB_TEST_DBMS" value="mysqli" />
	27	+ <server name="PHPBB_TEST_DBHOST" value="0.0.0.0" />
	28	+ <server name="PHPBB_TEST_DBPORT" value="3306" />
	29	+ <server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
	30	+ <server name="PHPBB_TEST_DBUSER" value="root" />
	31	+ <server name="PHPBB_TEST_DBPASSWD" value="" />
	32	+ <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
33	33	</php>
34	34	</phpunit>

Collapse file

‎travis/phpunit-postgres-travis.xml‎

Copy file name to clipboardExpand all lines: travis/phpunit-postgres-travis.xml

+7-7Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
@@ -25,12 +25,12 @@
25	25	<php>
26	26	<!-- "Real" test database -->
27	27	<!-- uncomment, otherwise sqlite memory runs -->
28		- <const name="dbms" value="postgres"/>
29		- <const name="dbhost" value="localhost" />
30		- <const name="dbport" value="5432" />
31		- <const name="dbname" value="phpbb_tests" />
32		- <const name="dbuser" value="postgres" />
33		- <const name="dbpasswd" value="" />
34		- <const name="table_prefix" value="phpbb_"/>
	28	+ <server name="PHPBB_TEST_DBMS" value="postgres"/>
	29	+ <server name="PHPBB_TEST_DBHOST" value="localhost" />
	30	+ <server name="PHPBB_TEST_DBPORT" value="5432" />
	31	+ <server name="PHPBB_TEST_DBNAME" value="phpbb_tests" />
	32	+ <server name="PHPBB_TEST_DBUSER" value="postgres" />
	33	+ <server name="PHPBB_TEST_DBPASSWD" value="" />
	34	+ <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
35	35	</php>
36	36	</phpunit>

0 commit comments

Comments

0 (0)