summaryrefslogtreecommitdiffstats
path: root/src/tests/intg/util.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests/intg/util.py')
-rw-r--r--src/tests/intg/util.py20
1 files changed, 14 insertions, 6 deletions
diff --git a/src/tests/intg/util.py b/src/tests/intg/util.py
index 6e8f15d02..a5e01b3db 100644
--- a/src/tests/intg/util.py
+++ b/src/tests/intg/util.py
@@ -20,6 +20,7 @@
import re
import os
import subprocess
+import config
UNINDENT_RE = re.compile("^ +", re.MULTILINE)
@@ -42,13 +43,20 @@ def run_shell():
Execute an interactive shell under "screen", preserving environment.
For use as a breakpoint for debugging.
"""
+ my_env = os.environ.copy()
+ my_env["ROOT_DIR"] = config.PREFIX
+
+ # screen filter out LD_* evniroment varibles.
+ # Back-up them and set them later in screenrc
+ my_env["_LD_LIBRARY_PATH"] = os.getenv("LD_LIBRARY_PATH", "")
+ my_env["_LD_PRELOAD"] = os.getenv("LD_PRELOAD", "")
+
subprocess.call([
- "screen", "-D", "-m", "bash", "-c",
- "PATH='" + os.getenv("PATH", "") + "' " +
- "LD_LIBRARY_PATH='" + os.getenv("LD_LIBRARY_PATH", "") + "' " +
- "LD_PRELOAD='" + os.getenv("LD_PRELOAD", "") + "' " +
- "bash -i"
- ])
+ "screen", "-DAm", "-S", "sssd_cwrap_session", "-c",
+ ".config/screenrc"],
+ env=my_env
+ )
+
def first_dir(*args):