Use test macros in phold and timerfd tests, fix bugs#1131
Merged
robgjansen merged 7 commits intoshadow:devfrom Mar 1, 2021
robgjansen:phold-timerfd-tests
Merged
Use test macros in phold and timerfd tests, fix bugs#1131robgjansen merged 7 commits intoshadow:devfrom robgjansen:phold-timerfd-tests
robgjansen merged 7 commits intoshadow:devfrom
robgjansen:phold-timerfd-tests
Conversation
Contributor
|
Related: #902 for the phold and timerfd tests. |
sporksmith
approved these changes
Mar 1, 2021
| if(emNanoSecs >= EMULATED_TIME_OFFSET) { | ||
| simNanoSecs = EMULATED_TIME_TO_SIMULATED_TIME(emNanoSecs); | ||
| } else { | ||
| simNanoSecs = 0; |
Contributor
There was a problem hiding this comment.
How do we get here, and why do we want to set to zero in that case?
| ## TODO swap the following lines when all tests have been converted to the macros | ||
| #set_tests_properties(leakcheck-shadow-grep PROPERTIES DEPENDS "${ALL_SHADOW_TESTS}") | ||
| set_tests_properties(leakcheck-shadow-grep PROPERTIES DEPENDS "bind-shadow-ptrace;bind-shadow-preload;clone-shadow-ptrace;config-convert-shadow;cpp-shadow-ptrace;cpp-shadow-preload;epoll-shadow-ptrace;epoll-writeable-shadow-ptrace;eventfd-shadow-ptrace;eventfd-shadow-preload;file-shadow-ptrace;mmap-shadow-ptrace;phold-shadow-ptrace;phold-threaded-shadow-ptrace;random-shadow-ptrace;random-shadow-preload;shutdown-shadow-ptrace;shutdown-shadow-preload;sleep-shadow-ptrace;sleep-shadow-preload;sockbuf-shadow-ptrace;socket-shadow-ptrace;socket-shadow-preload;bind-shadow-ptrace;bind-shadow-preload;listen-shadow-ptrace;listen-shadow-preload;getsockname-shadow-ptrace;getsockname-shadow-preload;accept-shadow-ptrace;accept-shadow-preload;timerfd-shadow-ptrace;udp-uniprocess-shadow-ptrace;udp-uniprocess-shadow-preload;udp-shadow-ptrace;unistd-shadow-ptrace;unistd-shadow-preload") | ||
| set_tests_properties(leakcheck-shadow-grep PROPERTIES DEPENDS "${ALL_SHADOW_TESTS}") |
| @@ -0,0 +1 @@ | |||
| phold.yaml No newline at end of file | |||
Contributor
There was a problem hiding this comment.
Huh; I guess this is an 'include'? I didn't know yaml supported that; SO seems to think it doesn't :). Since this isn't standard yaml could probably use a comment
Member
Author
There was a problem hiding this comment.
It's a symbolic link checked into the repo.
| @@ -0,0 +1 @@ | |||
| phold.yaml No newline at end of file | |||
Contributor
|
Oh huh, just noticed this is marked as a draft. I got an email notification for the PR and misinterpreted it as a review request 🤦♂️ |
Codecov Report
@@ Coverage Diff @@
## dev #1131 +/- ##
==========================================
+ Coverage 55.96% 57.07% +1.10%
==========================================
Files 136 136
Lines 20158 20133 -25
Branches 4830 4842 +12
==========================================
+ Hits 11282 11491 +209
+ Misses 5964 5669 -295
- Partials 2912 2973 +61
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
Member
Author
|
Thanks for the preemptive review :) |
Merged
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR finishes converting the remaining tests to the new macros: