From 3bb83ac7dbead8e8163f63401c0c3c37025bc6ae Mon Sep 17 00:00:00 2001
From: Philipp Sieweck <psi@informatik.uni-kiel.de>
Date: Tue, 12 Jan 2016 15:59:59 +0100
Subject: [PATCH 1/2] Fixed handling of filter regexps.

Regexps in RUST_LOG as explained in the module documentation should
only allow log messages that match the given expression and not the
other way around.
---
 env/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/env/src/lib.rs b/env/src/lib.rs
index 0594290ca..065f4da26 100644
--- a/env/src/lib.rs
+++ b/env/src/lib.rs
@@ -309,7 +309,7 @@ impl Log for Logger {
         }
 
         if let Some(filter) = self.filter.as_ref() {
-            if filter.is_match(&*record.args().to_string()) {
+            if !filter.is_match(&*record.args().to_string()) {
                 return;
             }
         }

From 8dddf7753763b4ce14bda92d725a093ad1dec672 Mon Sep 17 00:00:00 2001
From: Philipp Sieweck <psi@informatik.uni-kiel.de>
Date: Thu, 28 Jan 2016 18:46:01 +0100
Subject: [PATCH 2/2] Added test case for checking regular expression filters

---
 env/Cargo.toml             |  4 +++
 env/tests/regexp_filter.rs | 51 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 env/tests/regexp_filter.rs

diff --git a/env/Cargo.toml b/env/Cargo.toml
index fcea1e102..9e5ecf507 100644
--- a/env/Cargo.toml
+++ b/env/Cargo.toml
@@ -17,3 +17,7 @@ path = ".."
 
 [dependencies]
 regex = "0.1"
+
+[[test]]
+name = "regexp_filter"
+harness = false
diff --git a/env/tests/regexp_filter.rs b/env/tests/regexp_filter.rs
new file mode 100644
index 000000000..5036fb8e3
--- /dev/null
+++ b/env/tests/regexp_filter.rs
@@ -0,0 +1,51 @@
+#[macro_use] extern crate log;
+extern crate env_logger;
+
+use std::process;
+use std::env;
+use std::str;
+
+fn main() {
+    if env::var("LOG_REGEXP_TEST").ok() == Some(String::from("1")) {
+        child_main();
+    } else {
+        parent_main()
+    }
+}
+
+fn child_main() {
+    env_logger::init().unwrap();
+    info!("XYZ Message");
+}
+
+fn run_child(rust_log: String) -> bool {
+    let exe = env::current_exe().unwrap();
+    let out = process::Command::new(exe)
+        .env("LOG_REGEXP_TEST", "1")
+        .env("RUST_LOG", rust_log)
+        .output()
+        .unwrap_or_else(|e| panic!("Unable to start child process: {}", e));
+    str::from_utf8(out.stderr.as_ref()).unwrap().contains("XYZ Message")
+}
+
+fn assert_message_printed(rust_log: &str) {
+    if !run_child(rust_log.to_string()) {
+        panic!("RUST_LOG={} should allow the test log message", rust_log)
+    }
+}
+
+fn assert_message_not_printed(rust_log: &str) {
+    if run_child(rust_log.to_string()) {
+        panic!("RUST_LOG={} should not allow the test log message", rust_log)
+    }
+}
+
+fn parent_main() {
+    // test normal log severity levels
+    assert_message_printed("info");
+    assert_message_not_printed("warn");
+
+    // test of regular expression filters
+    assert_message_printed("info/XYZ");
+    assert_message_not_printed("info/XXX");
+}