CFE-2301 Make test more platform agnostic #2
Conversation
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
We have seen odd failures with output on solaris. This change switches from relying on external grep to our internal regex capabilities.
vpodzime
pushed a commit
that referenced
this pull request
Nov 20, 2019
An empty rlist is represented as a NULL pointer, so all Rlist
functions should handle NULL pointers at runtime.
Fixes an issue on FreeBSD, where RlistContainsString is
called on a NULL pointer (before any elements are added):
Core was generated by `/var/cfengine/bin/cf-key'.
Program terminated with signal SIGABRT, Aborted.
#0 0x00000008024219ba in thr_kill () from /lib/libc.so.7
(gdb) bt
#0 0x00000008024219ba in thr_kill () from /lib/libc.so.7
#1 0x0000000802421984 in __raise (s=6) at /usr/src/lib/libc/gen/raise.c:52
#2 0x00000008024218f9 in abort () at /usr/src/lib/libc/stdlib/abort.c:65
cfengine#3 0x000000080249d101 in __assert (func=<optimized out>, file=<optimized out>, line=<optimized out>, failedexpr=<optimized out>)
at /usr/src/lib/libc/gen/assert.c:51
cfengine#4 0x00000008008cc5b5 in RlistContainsString (list=0x0, string=0x8048af320 "0a:14:50:21:f0:44") at rlist.c:292
#5 0x00000008009163e1 in FindV6InterfacesInfo (ctx=0x80481c0c0, interfaces=0x7ffffffed098, hardware=0x7ffffffed090, ips=0x7ffffffed080)
at unix_iface.c:704
cfengine#6 0x0000000800915f16 in GetInterfacesInfo (ctx=0x80481c0c0) at unix_iface.c:565
cfengine#7 0x00000008009142eb in DetectEnvironment (ctx=0x80481c0c0) at sysinfo.c:3304
cfengine#8 0x00000008008ab30f in GenericAgentDiscoverContext (ctx=0x80481c0c0, config=0x80481c000) at generic_agent.c:537
#9 0x000000000040231b in main (argc=1, argv=0x7fffffffeaa8) at cf-key.c:148
This was introduced recently, and I don't believe it's been
in any released packages, so no changelog entry.
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>
vpodzime
pushed a commit
that referenced
this pull request
Dec 10, 2019
When compiling with explicit CFLAGS / LDFLAGS these are not handled in
the same way in different automake files.
The way we are mixing user-provided flags with configure generated ones
is not ideal, this change doesn't fix that, but it at least makes it
more consistent.
For example, compiling like this:
```
./autogen.sh --enable-debug && make CFLAGS="-fsanitize=address" LDFLAGS="-fsanitize=address"
```
Would cause the explicit flags to override flags from configure when
building cf-agent, but not in cf-promises. The end result is that debug
info (line numbers) is missing in some places.
**Before change:**
```
Direct leak of 9 byte(s) in 1 object(s) allocated from:
#0 0x7fc5c3640538 in strdup (/usr/lib/x86_64-linux-gnu/libasan.so.4+0x77538)
#1 0x7fc5c31badc0 in xstrdup /home/vagrant/cfe/core/libntech/libutils/alloc.c:58
#2 0x559ddf51b064 in VerifyNotInFstab (/var/cfengine/bin/cf-agent+0xa0064)
cfengine#3 0x559ddf4d6bd1 in VerifyMountPromise (/var/cfengine/bin/cf-agent+0x5bbd1)
cfengine#4 0x559ddf4d506c in VerifyStoragePromise (/var/cfengine/bin/cf-agent+0x5a06c)
#5 0x559ddf529cd9 in LocateFilePromiserGroup (/var/cfengine/bin/cf-agent+0xaecd9)
cfengine#6 0x559ddf4d4a83 in FindStoragePromiserObjects (/var/cfengine/bin/cf-agent+0x59a83)
cfengine#7 0x559ddf4d4a2d in FindAndVerifyStoragePromises (/var/cfengine/bin/cf-agent+0x59a2d)
cfengine#8 0x559ddf4b7239 in KeepAgentPromise (/var/cfengine/bin/cf-agent+0x3c239)
#9 0x7fc5c3138372 in ExpandPromiseAndDo /home/vagrant/cfe/core/libpromises/expand.c:215
cfengine#10 0x7fc5c3138713 in ExpandPromise /home/vagrant/cfe/core/libpromises/expand.c:283
cfengine#11 0x559ddf4b5e43 in ScheduleAgentOperations (/var/cfengine/bin/cf-agent+0x3ae43)
cfengine#12 0x559ddf4b5656 in KeepPromiseBundles (/var/cfengine/bin/cf-agent+0x3a656)
cfengine#13 0x559ddf4b2870 in KeepPromises (/var/cfengine/bin/cf-agent+0x37870)
cfengine#14 0x559ddf4b025b in main (/var/cfengine/bin/cf-agent+0x3525b)
cfengine#15 0x7fc5c238cb96 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b96)
```
**After change:**
```
Direct leak of 9 byte(s) in 1 object(s) allocated from:
#0 0x7fb282da4538 in strdup (/usr/lib/x86_64-linux-gnu/libasan.so.4+0x77538)
#1 0x7fb28291edc0 in xstrdup /home/vagrant/cfe/core/libntech/libutils/alloc.c:58
#2 0x55d8be8f6064 in VerifyNotInFstab /home/vagrant/cfe/core/cf-agent/nfs.c:541
cfengine#3 0x55d8be8b1bd1 in VerifyMountPromise /home/vagrant/cfe/core/cf-agent/verify_storage.c:491
cfengine#4 0x55d8be8b006c in VerifyStoragePromise /home/vagrant/cfe/core/cf-agent/verify_storage.c:146
#5 0x55d8be904cd9 in LocateFilePromiserGroup /home/vagrant/cfe/core/cf-agent/promiser_regex_resolver.c:62
cfengine#6 0x55d8be8afa83 in FindStoragePromiserObjects /home/vagrant/cfe/core/cf-agent/verify_storage.c:84
cfengine#7 0x55d8be8afa2d in FindAndVerifyStoragePromises /home/vagrant/cfe/core/cf-agent/verify_storage.c:75
cfengine#8 0x55d8be892239 in KeepAgentPromise /home/vagrant/cfe/core/cf-agent/cf-agent.c:1697
#9 0x7fb28289c372 in ExpandPromiseAndDo /home/vagrant/cfe/core/libpromises/expand.c:215
cfengine#10 0x7fb28289c713 in ExpandPromise /home/vagrant/cfe/core/libpromises/expand.c:283
cfengine#11 0x55d8be890e43 in ScheduleAgentOperations /home/vagrant/cfe/core/cf-agent/cf-agent.c:1431
cfengine#12 0x55d8be890656 in KeepPromiseBundles /home/vagrant/cfe/core/cf-agent/cf-agent.c:1344
cfengine#13 0x55d8be88d870 in KeepPromises /home/vagrant/cfe/core/cf-agent/cf-agent.c:831
cfengine#14 0x55d8be88b25b in main /home/vagrant/cfe/core/cf-agent/cf-agent.c:279
cfengine#15 0x7fb281af0b96 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b96)
```
Changelog: None
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>
vpodzime
pushed a commit
that referenced
this pull request
Feb 13, 2020
Also did a lot of refactoring, error checking, memory cleaning, et.c. Squashed commits: cf-keycrypt: license cf-keycrypt: PR fixes #1 cf-keycrypt: Fixed copyright in cf-keycrypt.c cf-keycrypt: CryptoInitialize() cf-keycrypt: Implemented new syntax as discussed in PR cf-keycrypt: Acceptance test for new arguments cf-keycrypt: Print help message when no arguments are added cf-keycrypt: PR fixes #2 cf-keycrypt: PR fixes cfengine#3 cf-keycrypt: PR fixes cfengine#4 cf-keycrypt: PR fixes #5 cf-keycrypt: Changed syntax to jimis' suggestion cf-keycrypt: Moved and fixed acceptance tests Changelog: Title Signed-off-by: Ole Herman Schumacher Elgesem <ole.elgesem@northern.tech>
vpodzime
pushed a commit
that referenced
this pull request
Mar 20, 2020
An empty rlist is represented as a NULL pointer, so all Rlist
functions should handle NULL pointers at runtime.
Fixes an issue on FreeBSD, where RlistContainsString is
called on a NULL pointer (before any elements are added):
Core was generated by `/var/cfengine/bin/cf-key'.
Program terminated with signal SIGABRT, Aborted.
#0 0x00000008024219ba in thr_kill () from /lib/libc.so.7
(gdb) bt
#0 0x00000008024219ba in thr_kill () from /lib/libc.so.7
#1 0x0000000802421984 in __raise (s=6) at /usr/src/lib/libc/gen/raise.c:52
#2 0x00000008024218f9 in abort () at /usr/src/lib/libc/stdlib/abort.c:65
cfengine#3 0x000000080249d101 in __assert (func=<optimized out>, file=<optimized out>, line=<optimized out>, failedexpr=<optimized out>)
at /usr/src/lib/libc/gen/assert.c:51
cfengine#4 0x00000008008cc5b5 in RlistContainsString (list=0x0, string=0x8048af320 "0a:14:50:21:f0:44") at rlist.c:292
#5 0x00000008009163e1 in FindV6InterfacesInfo (ctx=0x80481c0c0, interfaces=0x7ffffffed098, hardware=0x7ffffffed090, ips=0x7ffffffed080)
at unix_iface.c:704
cfengine#6 0x0000000800915f16 in GetInterfacesInfo (ctx=0x80481c0c0) at unix_iface.c:565
cfengine#7 0x00000008009142eb in DetectEnvironment (ctx=0x80481c0c0) at sysinfo.c:3304
cfengine#8 0x00000008008ab30f in GenericAgentDiscoverContext (ctx=0x80481c0c0, config=0x80481c000) at generic_agent.c:537
#9 0x000000000040231b in main (argc=1, argv=0x7fffffffeaa8) at cf-key.c:148
This was introduced recently, and I don't believe it's been
in any released packages, so no changelog entry.
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>
(cherry picked from commit 6ee912c)
vpodzime
pushed a commit
that referenced
this pull request
Jun 5, 2020
Also did a lot of refactoring, error checking, memory cleaning, et.c. Squashed commits: cf-keycrypt: license cf-keycrypt: PR fixes #1 cf-keycrypt: Fixed copyright in cf-keycrypt.c cf-keycrypt: CryptoInitialize() cf-keycrypt: Implemented new syntax as discussed in PR cf-keycrypt: Acceptance test for new arguments cf-keycrypt: Print help message when no arguments are added cf-keycrypt: PR fixes #2 cf-keycrypt: PR fixes cfengine#3 cf-keycrypt: PR fixes cfengine#4 cf-keycrypt: PR fixes #5 cf-keycrypt: Changed syntax to jimis' suggestion cf-keycrypt: Moved and fixed acceptance tests Changelog: Title Signed-off-by: Ole Herman Schumacher Elgesem <ole.elgesem@northern.tech> (cherry picked from commit 53d7769)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
We have seen odd failures with output on solaris. This change switches from
relying on external grep to our internal regex capabilities.