From d6ac4a1130721638ec76756ae0dd7b72136383c1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 9 May 2014 11:07:52 +0200
Subject: [PATCH] [ticket/10839] Always run functional tests by default

They are skipped anyway, if $phpbb_functional_url is not configured.
If you want to run tests without functional tests, just append
    --exclude-group functional
to your call

PHPBB3-10839
---
 phpunit.xml.dist       |  9 ++++-----
 phpunit.xml.functional | 39 ---------------------------------------
 2 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100644 phpunit.xml.functional

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index f5871e2eeb..c4906e42fe 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -15,19 +15,18 @@
         <testsuite name="phpBB Test Suite">
             <directory suffix="_test.php">./tests</directory>
             <exclude>./tests/functional</exclude>
-            <exclude>tests/lint_test.php</exclude>
-        </testsuite>
-        <testsuite name="phpBB Lint Test">
-            <file>tests/lint_test.php</file>
+            <exclude>./tests/lint_test.php</exclude>
         </testsuite>
         <testsuite name="phpBB Functional Tests">
             <directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">./tests/functional</directory>
         </testsuite>
+        <testsuite name="phpBB Lint Test">
+            <file>./tests/lint_test.php</file>
+        </testsuite>
     </testsuites>
 
     <groups>
         <exclude>
-            <group>functional</group>
             <group>slow</group>
         </exclude>
     </groups>
diff --git a/phpunit.xml.functional b/phpunit.xml.functional
deleted file mode 100644
index 9f3033b074..0000000000
--- a/phpunit.xml.functional
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="true"
-         backupStaticAttributes="true"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
->
-    <testsuites>
-        <testsuite name="phpBB Test Suite">
-            <directory suffix="_test.php">./tests</directory>
-            <exclude>./tests/functional</exclude>
-            <exclude>tests/lint_test.php</exclude>
-        </testsuite>
-        <testsuite name="phpBB Lint Test">
-            <file>tests/lint_test.php</file>
-        </testsuite>
-        <testsuite name="phpBB Functional Tests">
-            <directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">./tests/functional</directory>
-        </testsuite>
-    </testsuites>
-
-    <groups>
-        <include>
-            <group>functional</group>
-        </include>
-    </groups>
-
-    <filter>
-        <blacklist>
-            <directory>./tests</directory>
-        </blacklist>
-    </filter>
-</phpunit>