Author: tfiala
Date: Wed Jun 15 16:31:02 2016
New Revision: 272844
URL: http://llvm.org/viewvc/llvm-project?rev=272844&view=rev
Log:
Set TERM env var for Xcode gtests
Not sure what changed, but something outside our code
is failing one of the EditLine gtests on OS X CI (and
locally) before the gtest ever gets to run. This fails
the first EditLine gtest.
This change exports the TERM as "vt100" before running
the lldb-gtest binary, fixing the issue.
Modified:
lldb/trunk/lldb.xcodeproj/project.pbxproj
Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=272844&r1=272843&r2=272844&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Wed Jun 15 16:31:02 2016
@@ -6336,7 +6336,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "# Run the just-built gtest
executable\n\n# Uncomment this to see the steps in action\n# set -x\n\n# We
need to hide the lldb.py that goes into BUILT_PRODUCTS\n# because it will
conflict with finding the lldb module later,\n# which causes the python
exception tests to fail.\nif [ -f \"${BUILT_PRODUCTS_DIR}/lldb.py\" ]; then\n
mv -f \"${BUILT_PRODUCTS_DIR}/lldb.py\"
\"${BUILT_PRODUCTS_DIR}/park.lldb.py\"\nfi\n\n# Tell lldb-gtest where to find
the lldb package\nexport
PYTHONPATH=${BUILT_PRODUCTS_DIR}/LLDB.framework/Resources/Python\n\n# We must
redirect stdin to /dev/null: without this, xcodebuild\n# will wait forever for
input when we run the TestExceptionStateChecking\n#
test.\n${BUILT_PRODUCTS_DIR}/lldb-gtest
--gtest_output=xml:${BUILD_DIR}/gtest-results.xml < /dev/null\nRETCODE=$?\n\nif
[ -f \"${BUILT_PRODUCTS_DIR}/park.lldb.py\" ]; then\nmv -f
\"${BUILT_PRODUCTS_DIR}/park.lldb.py\"
\"${BUILT_PRODUCTS_DIR}/lldb.py\"\nfi\n\nexit ${RETCODE}";
+ shellScript = "# Run the just-built gtest
executable\n\n# Uncomment this to see the steps in action\n# set -x\n\n# We
need to hide the lldb.py that goes into BUILT_PRODUCTS\n# because it will
conflict with finding the lldb module later,\n# which causes the python
exception tests to fail.\nif [ -f \"${BUILT_PRODUCTS_DIR}/lldb.py\" ]; then\n
mv -f \"${BUILT_PRODUCTS_DIR}/lldb.py\"
\"${BUILT_PRODUCTS_DIR}/park.lldb.py\"\nfi\n\n# Tell lldb-gtest where to find
the lldb package\nexport
PYTHONPATH=${BUILT_PRODUCTS_DIR}/LLDB.framework/Resources/Python\n\n# Set the
terminal to VT100 so that the editline internals don't\n# fail.\nexport
TERM=vt100\n\n# We must redirect stdin to /dev/null: without this,
xcodebuild\n# will wait forever for input when we run the
TestExceptionStateChecking\n# test.\n${BUILT_PRODUCTS_DIR}/lldb-gtest
--gtest_output=xml:${BUILD_DIR}/gtest-results.xml < /dev/null\nRETCODE=$?\n\nif
[ -f \"${BUILT_PRODUCTS_DIR}/park.lldb.py\" ]; then\nmv -f
\"${BUILT_PRODUCTS_DIR
}/park.lldb.py\" \"${BUILT_PRODUCTS_DIR}/lldb.py\"\nfi\n\nexit ${RETCODE}";
};
261B5A7511C3FA6F00AABD0A /* Fixup Framework Headers */ = {
isa = PBXShellScriptBuildPhase;
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
