From 18b07190bfa1f8ee839c09ef260a1b770aacfb7f Mon Sep 17 00:00:00 2001
From: Vaclav Muzikar <vmuzikar@redhat.com>
Date: Tue, 15 Mar 2016 13:05:33 +0100
Subject: [PATCH] Add system property for test constants location (cherry
 picked from commit f9afa13)

---
 .../test/java/org/keycloak/testsuite/AbstractKeycloakTest.java | 2 +-
 testsuite/integration-arquillian/tests/pom.xml                 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java
index a15cdb6687..034bd333ea 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java
@@ -276,7 +276,7 @@ public abstract class AbstractKeycloakTest {
     }
 
     private void loadConstantsProperties() throws ConfigurationException {
-        constantsProperties = new PropertiesConfiguration("test-constants.properties");
+        constantsProperties = new PropertiesConfiguration(System.getProperty("testsuite.constants"));
         constantsProperties.setThrowExceptionOnMissing(true);
     }
 
diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index 0527852f08..f77d369472 100644
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -68,6 +68,8 @@
         <backends.console.output>true</backends.console.output>
         
         <auth.server.java.home>${java.home}</auth.server.java.home>
+
+        <testsuite.constants>test-constants.properties</testsuite.constants>
         
     </properties>
 
@@ -127,6 +129,7 @@
                             <jboss.server.config.dir>${jboss.server.config.dir}</jboss.server.config.dir>
                             <frontend.console.output>${frontend.console.output}</frontend.console.output>
                             <backends.console.output>${backend.console.output}</backends.console.output>
+                            <testsuite.constants>${testsuite.constants}</testsuite.constants>
                         </systemPropertyVariables>
                         <properties>
                             <property>