History

macos: Adjust tests2.112 and tests2 Makefile

* <malloc.h> isn't as portable as <stdlib.h> * skip 113_btdll.c on Darwin * replace [...]\+ with [...]\{1,\} in the sed regex (basic REs have no + even some sed(1) accept it as \+, but bounds _are_ part of POSIX BREs)

Michael Matz committed 6 years ago

Commit 91cb4131 parent 71b06342 files · +3 −2Browse files

Unified · Split

2 files
  1. tests/tests2/112_backtrace.c +1 −1
  2. tests/tests2/Makefile +2 −1
tests/tests2/112_backtrace.c+1−1
@@ -84,7 +84,7 @@ int main(int argc, char **argv) · 83 unmodified lines
8484
8585 /* ------------------------------------------------------- */
8686 #else
87−#include <malloc.h>
87+#include <stdlib.h>
8888 #include <string.h>
8989 char *strdup();
9090 int main()
tests/tests2/Makefile+2−1
@@ -14,6 +14,7 @@ ifeq ($(CONFIG_arm_eabi),yes) # not ARM soft-float · 13 unmodified lines
1414 endif
1515 ifdef CONFIG_OSX
1616 SKIP += 40_stdio.test 42_function_pointer.test
17+ SKIP += 113_btdll.test # no shared lib support yet
1718 FLAGS += -w
1819 SDK := `xcrun --show-sdk-path`
1920 TCCFLAGS += -I$(SDK)/usr/include
@@ -88,7 +89,7 @@ GEN-ALWAYS = · 68 unmodified lines
8889 112_backtrace.test: FLAGS += -dt -b
8990 112_backtrace.test 113_btdll.test: FILTER += \
9091 -e 's;[0-9A-Fa-fx]\{5,\};........;g' \
91− -e 's;0x[0-9A-Fa-f]\+;0x?;g'
92+ -e 's;0x[0-9A-Fa-f]\{1,\};0x?;g'
9293
9394 # this test creates two DLLs and an EXE
9495 113_btdll.test: NORUN = true

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t