diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2017-10-06 13:14:39 -0400 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2017-10-06 13:37:34 -0400 |
commit | 9c150609caf02835cdaab105a541fc7502884915 (patch) | |
tree | d197774fa1b17bb91a86bc5190582a50c3bc4739 | |
parent | 544600f074b791152373d8e20681ac698e1f398b (diff) |
Fix up env check for changes to XCTest running
-rw-r--r-- | Foundation/GTMScriptRunnerTest.m | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Foundation/GTMScriptRunnerTest.m b/Foundation/GTMScriptRunnerTest.m index c8050f5..5f52e61 100644 --- a/Foundation/GTMScriptRunnerTest.m +++ b/Foundation/GTMScriptRunnerTest.m @@ -218,6 +218,11 @@ // Account for the shell level. [currVars setObject:@"1" forKey:@"SHLVL"]; + // Xcode inserts DYLD_FRAMEWORK_PATH and DYLD_LIBRARY_PATH when running XCTests, + // but that doesn't get passed on when running the script. + [currVars removeObjectForKey:@"DYLD_FRAMEWORK_PATH"]; + [currVars removeObjectForKey:@"DYLD_LIBRARY_PATH"]; + output = [sr run:@"/usr/bin/env | /usr/bin/sort" standardError:&error]; NSArray *lineArray = [output componentsSeparatedByString:@"\n"]; XCTAssertEqual([lineArray count], [currVars count], |