-
Notifications
You must be signed in to change notification settings - Fork 577
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix missing 'fi' statement (#3133) #3302
Fix missing 'fi' statement (#3133) #3302
Conversation
This 'fi' statement got deleted accidentally when resolving a merge conflict. This should fix this script for PR testing.
Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I approve. This looks likely to fix the issue we saw.
Will PR testing allow this to pass, or will it use the version of PullRequestLinuxDriver.sh that is in 'develop' in which case this PR testing will fail? I guess time will tell (once the PR tester starts up and runs this). |
Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.8.4
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Using Repos:
Pull Request Author: bartlettroscoe |
CC: @rppawlo @trilinos/framework PR testing is going to fail for this PR as shown, for example, at: which shows:
This shows that the PR tester uses the script Can someone with the abilities please manually merge this PR branch to 'develop' or give me the temporary permissions to do so? |
Status Flag 'Pull Request AutoTester' - Jenkins Testing: 1 or more Jobs FAILED Note: Testing will normally be attempted again in approx. 2 Hrs 30 Mins. If a change to the PR source branch occurs, the testing will be attempted again on next available autotester run. Pull Request Auto Testing has FAILED (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.8.4
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.9.3 # 1361 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.8.4 # 1055 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_intel_17.0.1 # 604 (click to expand)
|
Due to the nature of this PR, I merged this manually to get the testing working again. |
@trilinos/framework, @rppawlo
Description
Adds back a missing 'fi' statement got deleted accidentally when resolving a merge conflict.
This should fix this script for PR testing.
Motivation and Context
Current PRs are crashing due to this (e.g. #3300, #3301). Therefore, it is urgent to get this merged.
How Has This Been Tested?
I did not test this. I fixed this by inspection. It is a one-line change.
Checklist