From 184d53ac40f953e0f99d88fe6e2f3c1b4ed851ac Mon Sep 17 00:00:00 2001
From: Allen Gilliland <agilliland@gmail.com>
Date: Thu, 19 Mar 2015 16:28:22 -0700
Subject: [PATCH] move the unit testing log4j.properties out the 'test' code
folder because then it's also used in a lot of other places. instead just
create a new test_resources folder which we only apply to the unit tests
profile.
---
project.clj | 3 ++-
{test => test_resources}/log4j.properties | 0
2 files changed, 2 insertions(+), 1 deletion(-)
rename {test => test_resources}/log4j.properties (100%)
diff --git a/project.clj b/project.clj
index 8c5f7c5e74b..2ec1a05e2bd 100644
--- a/project.clj
+++ b/project.clj
@@ -70,7 +70,8 @@
"-XX:MaxPermSize=128m" ; a little more headroom for PermGen
"-XX:+CMSClassUnloadingEnabled" ; let Clojure's dynamically generated temporary classes be GC'ed from PermGen
"-XX:+UseConcMarkSweepGC"]} ; Concurrent Mark Sweep GC needs to be used for Class Unloading (above)
- :expectations {:jvm-opts ["-Dmb.db.file=target/metabase-test"
+ :expectations {:resource-paths ["test_resources"]
+ :jvm-opts ["-Dmb.db.file=target/metabase-test"
"-Dmb.jetty.join=false"
"-Dmb.jetty.port=3001"]}
:uberjar {:aot :all
diff --git a/test/log4j.properties b/test_resources/log4j.properties
similarity index 100%
rename from test/log4j.properties
rename to test_resources/log4j.properties
--
GitLab