git.iko.soy/Idris-dev
on master help sign in
Merge pull request #3975 from bonds/master
a5ff76dNiklas Larsson
test/TestRun.hs+2−1
compare with master
unifiedsplit
@@ -65,7 +65,8 @@ test testName path = goldenVsFileDiff testName diff ref output
65 where
65 where
66 ref = path </> "expected"
66 ref = path </> "expected"
67 output = path </> "output"
67 output = path </> "output"
68+ diff ref new | os == "openbsd" = ["diff", "-u", new, ref]
68− diff ref new = ["diff", "--strip-trailing-cr", "-u", new, ref]
69+ | otherwise = ["diff", "--strip-trailing-cr", "-u", new, ref]
69
70
70-- Should always output a 3-charater string from a postive Int
71-- Should always output a 3-charater string from a postive Int
71indexToString :: Int -> String
72indexToString :: Int -> String
test/base001/exit1.c+4
@@ -1,6 +1,10 @@
1#include <stdio.h>
1#include <stdio.h>
2#include <stdlib.h>
2#include <stdlib.h>
3
3
4+#ifdef __OpenBSD__
5+#include <sys/wait.h>
6+#endif
7+
4void doSystem(const char cmd[]) {
8void doSystem(const char cmd[]) {
5 printf("exit1: Executing cmd '%s'\n", cmd);
9 printf("exit1: Executing cmd '%s'\n", cmd);
6 int exitStatus = system(cmd);
10 int exitStatus = system(cmd);
test/base001/sys.c+4
@@ -2,6 +2,10 @@
2
2
3#include <stdlib.h>
3#include <stdlib.h>
4
4
5+#ifdef __OpenBSD__
6+#include <sys/wait.h>
7+#endif
8+
5int WIFEXITED_(int status) {
9int WIFEXITED_(int status) {
6 return WIFEXITED(status);
10 return WIFEXITED(status);
7}
11}