mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: Tidy up mac test setup

This commit is contained in:
ta264 2019-09-15 22:25:45 +01:00
parent 4461ca3080
commit 200473408a
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
azure-pipelines.yml
View File

@ -254,23 +254,22 @@ stages:
displayName: Enable Windows Test Service displayName: Enable Windows Test Service
condition: and(succeeded(), eq(variables['osName'], 'Windows')) condition: and(succeeded(), eq(variables['osName'], 'Windows'))
- bash: | - bash: |
SYMLINK=5_18_1
MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$SYMLINK
echo "##vso[task.setvariable variable=MONOPREFIX;]$MONOPREFIX"
echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH"
chmod a+x _tests/fpcalc chmod a+x _tests/fpcalc
export DYLD_FALLBACK_LIBRARY_PATH=${BUILD_SOURCESDIRECTORY}/_tests displayName: Set Mono Version and make fpcalc Executable
displayName: Make fpcalc Executable
condition: and(succeeded(), eq(variables['osName'], 'Mac')) condition: and(succeeded(), eq(variables['osName'], 'Mac'))
- task: Bash@3 - task: Bash@3
displayName: Run Tests displayName: Run Tests
env: env:
DYLD_FALLBACK_LIBRARY_PATH: $(Build.SourcesDirectory)/_tests
TEST_DIR: $(Build.SourcesDirectory)/_tests TEST_DIR: $(Build.SourcesDirectory)/_tests
inputs: inputs:
targetType: 'filePath' targetType: 'filePath'
filePath: '$(testsFolder)/test.sh' filePath: '$(testsFolder)/test.sh'
arguments: '$(osName) Unit Test' arguments: '$(osName) Unit Test'
- publish: TestResult.xml
artifact: 'TestResult'
displayName: Publish Test Result
condition: and(succeeded(), eq(variables['osName'], 'Windows'))
- task: PublishTestResults@2 - task: PublishTestResults@2
displayName: Publish Test Results displayName: Publish Test Results
inputs: inputs:
@ -316,7 +315,7 @@ stages:
container: $[ variables['containerImage'] ] container: $[ variables['containerImage'] ]
timeoutInMinutes: 5 timeoutInMinutes: 10
steps: steps:
- bash: mono --version - bash: mono --version
@ -330,8 +329,6 @@ stages:
targetPath: $(testsFolder) targetPath: $(testsFolder)
- task: Bash@3 - task: Bash@3
displayName: Run Tests displayName: Run Tests
env:
TEST_DIR: $(Build.SourcesDirectory)/_tests
inputs: inputs:
targetType: 'filePath' targetType: 'filePath'
filePath: '$(testsFolder)/test.sh' filePath: '$(testsFolder)/test.sh'
@ -369,7 +366,7 @@ stages:
- bash: | - bash: |
SYMLINK=5_18_1 SYMLINK=5_18_1
MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$SYMLINK MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$SYMLINK
echo "##vso[task.setvariable variable=DYLD_FALLBACK_LIBRARY_PATH;].:$MONOPREFIX/lib:/lib:/usr/lib:$DYLD_LIBRARY_FALLBACK_PATH" echo "##vso[task.setvariable variable=MONOPREFIX;]$MONOPREFIX"
echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH" echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH" echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH"
displayName: Set Mono Version displayName: Set Mono Version

5
test.sh
View File

@ -29,10 +29,9 @@ NUNIT_PARAMS="--workers=1"
if [ "$PLATFORM" = "Mac" ]; then if [ "$PLATFORM" = "Mac" ]; then
export DYLD_FALLBACK_LIBRARY_PATH="$TEST_DIR:/usr/local/lib:/lib:/usr/lib" export DYLD_FALLBACK_LIBRARY_PATH="$TEST_DIR:$MONOPREFIX/lib:/usr/local/lib:/lib:/usr/lib"
echo $LD_LIBRARY_PATH
echo $DYLD_LIBRARY_PATH
echo $DYLD_FALLBACK_LIBRARY_PATH echo $DYLD_FALLBACK_LIBRARY_PATH
mono --version
# To debug which libraries are being loaded: # To debug which libraries are being loaded:
# export DYLD_PRINT_LIBRARIES=YES # export DYLD_PRINT_LIBRARIES=YES