X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tests%2Ftest_environment.sh;h=eb1c8e4c0518d6d9606e6b48334b8666f5dcb4a7;hb=f54cd101d750cb31f54081a41d6cb880a9199dba;hp=a530718735dd20358569192282ecf4691a3f22c1;hpb=59375c2b7949791d8cad8e5cebde2649bac83ec8;p=coloredstderr%2Fcoloredstderr.git

diff --git a/tests/test_environment.sh b/tests/test_environment.sh
index a530718..eb1c8e4 100755
--- a/tests/test_environment.sh
+++ b/tests/test_environment.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2013  Simon Ruderich
+# Copyright (C) 2013-2014  Simon Ruderich
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 test "x$srcdir" = x && srcdir=.
 . "$srcdir/lib.sh"
 
-# Test unexpected values for COLORED_STDERR_FDS environment variable.
+# Test unexpected values for COLORED_STDERR_PRIVATE_FDS environment variable.
 
 # Empty fields.
 fds=
@@ -44,3 +44,35 @@ test_program_subshell example example_environment
 fds=-20,-30,2,-1,
 test_program          example example_environment
 test_program_subshell example example_environment
+
+# Test COLORED_STDERR_FDS overwrites COLORED_STDERR_PRIVATE_FDS. Additional
+# tests in example_exec.
+
+fds=
+COLORED_STDERR_FDS=2,
+export COLORED_STDERR_FDS
+test_program          example example_environment
+test_program_subshell example example_environment
+
+fds=2,
+COLORED_STDERR_FDS=
+export COLORED_STDERR_FDS
+test_program          example example_environment_empty
+test_program_subshell example example_environment_empty
+
+unset COLORED_STDERR_FDS
+
+
+# Test COLORED_STDERR_IGNORED_BINARIES.
+
+if test -x /proc/self/exe; then
+    COLORED_STDERR_IGNORED_BINARIES="$abs_builddir/example"
+    export COLORED_STDERR_IGNORED_BINARIES
+    test_program          example example_environment_empty
+    test_program_subshell example example_environment_empty
+
+    COLORED_STDERR_IGNORED_BINARIES=",some,other,path,,"
+    export COLORED_STDERR_IGNORED_BINARIES
+    test_program          example example_environment
+    test_program_subshell example example_environment
+fi