This repository has been archived by the owner on Nov 22, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 954
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix the regex to allow xcode from non standard location (#1939)
Summary: Pull Request resolved: #1939 This diff fixes T84865014. We used to assume in our xcode cli check that xcode will be run from standard /Applications folder. But as mentioned in the above tasks, its not always true. Reviewed By: passy Differential Revision: D26484287 fbshipit-source-id: 32d343dece53576f99cbbb6d193138e803505935
- Loading branch information
1 parent
e491ed5
commit 6d22067
Showing
2 changed files
with
58 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
/** | ||
* Copyright (c) Facebook, Inc. and its affiliates. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
* | ||
* @format | ||
*/ | ||
|
||
import {parseXcodeFromCoreSimPath} from '../iOSDevice'; | ||
|
||
const standardCoresimulatorLog = | ||
'username 1264 0.0 0.1 5989740 41648 ?? Ss 2:23PM 0:12.92 /Applications/Xcode_12.4.0_fb.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/usr/libexec/mobileassetd'; | ||
|
||
const nonStandardCoresimulatorLog = | ||
'username 1264 0.0 0.1 5989740 41648 ?? Ss 2:23PM 0:12.92 /Some/Random/Path/Xcode_12.4.0_fb.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/usr/libexec/mobileassetd'; | ||
|
||
const nonStandardSpecialCharacterAphanumericCoresimulatorLog = | ||
'username 1264 0.0 0.1 5989740 41648 ?? Ss 2:23PM 0:12.92 /Some_R@d0m/Path-3455355/path(2)+connection/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/usr/libexec/mobileassetd'; | ||
|
||
test('test parseXcodeFromCoreSimPath from non standard locations', () => { | ||
const match = parseXcodeFromCoreSimPath(nonStandardCoresimulatorLog); | ||
expect(match && match.length > 0).toBeTruthy(); | ||
expect( | ||
// @ts-ignore the null and non zero lenght check for match is already done above | ||
match[0], | ||
).toEqual('/Some/Random/Path/Xcode_12.4.0_fb.app/Contents/Developer'); | ||
}); | ||
|
||
test('test parseXcodeFromCoreSimPath from non standard alphanumeric special character locations', () => { | ||
const match = parseXcodeFromCoreSimPath( | ||
nonStandardSpecialCharacterAphanumericCoresimulatorLog, | ||
); | ||
expect(match && match.length > 0).toBeTruthy(); | ||
expect( | ||
// @ts-ignore the null and non zero lenght check for match is already done above | ||
match[0], | ||
).toEqual( | ||
'/Some_R@d0m/Path-3455355/path(2)+connection/Xcode.app/Contents/Developer', | ||
); | ||
}); | ||
|
||
test('test parseXcodeFromCoreSimPath from standard locations', () => { | ||
const match = parseXcodeFromCoreSimPath(standardCoresimulatorLog); | ||
expect(match && match.length > 0).toBeTruthy(); | ||
expect( | ||
// @ts-ignore the null and non zero lenght check for match is already done above | ||
match[0], | ||
).toEqual('/Applications/Xcode_12.4.0_fb.app/Contents/Developer'); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters