From 895b491d84cc85085d8b84f4135c334d6c49d2c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 5 Aug 2012 14:06:09 +0200
Subject: [PATCH] Uniformize files

---
 test/phpunit/jenkins_phpunittest.xml | 4 ++--
 test/phpunit/phpunittest.xml         | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/phpunit/jenkins_phpunittest.xml b/test/phpunit/jenkins_phpunittest.xml
index 8c9b93179f8..9e29f2f9650 100644
--- a/test/phpunit/jenkins_phpunittest.xml
+++ b/test/phpunit/jenkins_phpunittest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE phpunit SYSTEM "phpunit.dtd" >
-<phpunit 
+<phpunit
 	backupGlobals="true"
 	backupStaticAttributes="false"
 	convertErrorsToExceptions="true"
@@ -51,4 +51,4 @@
 </filter>
 <ini name="max_execution_time" value="600"/>
 <ini name="max_input_time" value="600"/>
-</phpunit>
+</phpunit>
\ No newline at end of file
diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml
index 20d2cf57e34..13d0d7e4154 100644
--- a/test/phpunit/phpunittest.xml
+++ b/test/phpunit/phpunittest.xml
@@ -8,7 +8,7 @@
 	convertWarningsToExceptions="true"
 	colors="true"
 	processIsolation="false"
-	stopOnFailure="false"
+	stopOnFailure="true"
 	syntaxCheck="true">
 <filter>
   <blacklist>
@@ -18,7 +18,6 @@
     <directory suffix=".php">../../test/</directory>
     <directory suffix=".php">../../htdocs/core/menus/smartphone/</directory>
     <directory suffix=".php">../../htdocs/custom/</directory>
-    <directory suffix=".php">../../htdocs/custom2/</directory>
     <directory suffix=".php">../../htdocs/products/canvas/</directory>
     <directory suffix=".php">../../htdocs/contact/canvas/</directory>
     <directory suffix=".php">../../htdocs/societe/canvas/</directory>
@@ -41,7 +40,6 @@
     <directory suffix=".php">../../test/</directory>
     <directory suffix=".php">../../htdocs/core/menus/smartphone</directory>
     <directory suffix=".php">../../htdocs/custom/</directory>
-    <directory suffix=".php">../../htdocs/custom2/</directory>
     <directory suffix=".php">../../htdocs/products/canvas/</directory>
     <directory suffix=".php">../../htdocs/contact/canvas/</directory>
     <directory suffix=".php">../../htdocs/societe/canvas/</directory>