colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch from exit(1) to abort() in assert_success

Browse Source
This commit is contained in:
Tobias Bergkvist 2021-12-01 22:56:18 +01:00
parent 4e55d34535
commit 97d62a90f5
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/setup-hooks/make-binary-wrapper.sh
View File

@ -138,7 +138,7 @@ makeCWrapper() {
[ -z "$uses_concat3" ] || printf '%s\n' "#include <string.h>"
[ -z "$uses_assert" ] || printf '%s\n' "#include <assert.h>"
[ -z "$uses_assert_success" ] || printf '%s\n' "#include <stdio.h>"
[ -z "$uses_assert_success" ] || printf '\n%s\n' "#define assert_success(e) do { if ((e) < 0) { perror(#e); exit(1); } } while (0)"
[ -z "$uses_assert_success" ] || printf '\n%s\n' "#define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)"
[ -z "$uses_concat3" ] || printf '\n%s\n' "$(concat3Fn)"
[ -z "$uses_prefix" ] || printf '\n%s\n' "$(setEnvPrefixFn)"
[ -z "$uses_suffix" ] || printf '\n%s\n' "$(setEnvSuffixFn)"

2
pkgs/test/make-binary-wrapper/combination.c
View File

@ -12,7 +12,7 @@
#include <assert.h>
#include <stdio.h>
#define assert_success(e) do { if ((e) < 0) { perror(#e); exit(1); } } while (0)
#define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)
char *concat3(char *x, char *y, char *z) {
int xn = strlen(x);

2
pkgs/test/make-binary-wrapper/env.c
View File

@ -8,7 +8,7 @@
#include <stdlib.h>
#include <stdio.h>
#define assert_success(e) do { if ((e) < 0) { perror(#e); exit(1); } } while (0)
#define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)
int main(int argc, char **argv) {
putenv("PART1=HELLO");

2
pkgs/test/make-binary-wrapper/invalid-env.c
View File

@ -6,7 +6,7 @@
#include <stdlib.h>
#include <stdio.h>
#define assert_success(e) do { if ((e) < 0) { perror(#e); exit(1); } } while (0)
#define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)
int main(int argc, char **argv) {
putenv("==TEST1");

2
pkgs/test/make-binary-wrapper/prefix.c
View File

@ -8,7 +8,7 @@
#include <assert.h>
#include <stdio.h>
#define assert_success(e) do { if ((e) < 0) { perror(#e); exit(1); } } while (0)
#define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)
char *concat3(char *x, char *y, char *z) {
int xn = strlen(x);

2
pkgs/test/make-binary-wrapper/suffix.c
View File

@ -8,7 +8,7 @@
#include <assert.h>
#include <stdio.h>
#define assert_success(e) do { if ((e) < 0) { perror(#e); exit(1); } } while (0)
#define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)
char *concat3(char *x, char *y, char *z) {
int xn = strlen(x);