summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2013-09-22 09:38:44 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2013-09-22 09:38:44 (GMT)
commitdf4cb129e4a449ca0b6556dcc9437a35bef5723d (patch)
treef321a73b49af09e85351f0fce5cd1ee0ad68fb87
parent710a67edfc5ffe085284d60c438008ac563fb984 (diff)
parentce34687d23bb68df1270728372f04ac7c80f3caa (diff)
downloadcpython-df4cb129e4a449ca0b6556dcc9437a35bef5723d.zip
cpython-df4cb129e4a449ca0b6556dcc9437a35bef5723d.tar.gz
cpython-df4cb129e4a449ca0b6556dcc9437a35bef5723d.tar.bz2
Merge from 3.3
-rw-r--r--Lib/test/test_gdb.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
index 8bd6797..624e3d3 100644
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -65,7 +65,8 @@ gdbpy_version, _ = run_gdb("--eval-command=python import sys; print sys.version_
if not gdbpy_version:
raise unittest.SkipTest("gdb not built with embedded python support")
-# Verify that "gdb" can load our custom hooks. In theory this should never fail.
+# Verify that "gdb" can load our custom hooks, as OS security settings may
+# disallow this without a customised .gdbinit.
cmd = ['--args', sys.executable]
_, gdbpy_errors = run_gdb('--args', sys.executable)
if "auto-loading has been declined" in gdbpy_errors: