X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-log4j%2FJTestLTTng.java;h=1b4a51b45c02132027a812e7b2cb283118cdadf5;hp=64a471bf85607ffe6238f5ced8b6d436cc73a875;hb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;hpb=0b7af9456fb564df73d32ff7712200d14569a375

diff --git a/tests/regression/ust/java-log4j/JTestLTTng.java b/tests/regression/ust/java-log4j/JTestLTTng.java
index 64a471bf8..1b4a51b45 100644
--- a/tests/regression/ust/java-log4j/JTestLTTng.java
+++ b/tests/regression/ust/java-log4j/JTestLTTng.java
@@ -1,20 +1,10 @@
 /*
- * Copyright (C) 2015 - Michael Jeanson <dgoulet@efficios.com>
- * Copyright (C) 2014 - David Goulet <dgoulet@efficios.com>
- *                      Christian Babeux <christian.babeux@efficios.com>
+ * Copyright (C) 2015 Michael Jeanson <mjeanson@efficios.com>
+ * Copyright (C) 2014 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2014 Christian Babeux <christian.babeux@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 import java.io.IOException;
@@ -23,6 +13,7 @@ import java.lang.Integer;
 import org.apache.log4j.Appender;
 import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
 import org.lttng.ust.agent.log4j.LttngLogAppender;
 
 public class JTestLTTng {
@@ -40,6 +31,18 @@ public class JTestLTTng {
 		Logger lttng = Logger.getLogger("log4j-event");
 		Logger lttng2 = Logger.getLogger("log4j-event-2");
 
+		/*
+		 * Set lowest level to make sure all event levels are logged.
+		 * Any jar can override the default log4j rootLogger level
+		 * and a logger with no explicit level defaults to the non-null
+		 * parent level. Events could be ignored if the inherited value
+		 * is too low, thereby failing the test.
+		 *
+		 * See BSF  -> https://issues.apache.org/jira/browse/BSF-24
+		 */
+		lttng.setLevel(Level.ALL);
+		lttng2.setLevel(Level.ALL);
+
 		int nrIter = Integer.parseInt(args[0]);
 		int waitTime = Integer.parseInt(args[1]);
 		int fire_debug_tp = 0;