Commit 585030fc35b9b25073a173fd7c718425828ebd73
2023-11-15T00:54:03
configure and tests
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286
diff --git a/config.subr b/config.subr
index b5e4a6c..b47437c 100644
--- a/config.subr
+++ b/config.subr
@@ -111,6 +111,13 @@ config_lib() {
rm "$OUT"
}
+env_reset() {
+ CPPFLAGS="$ENV_CPPFLAGS"
+ CFLAGS="$ENV_CFLAGS"
+ LDFLAGS="$ENV_LDFLAGS"
+ LIBS="$ENV_LIBS"
+}
+
objc_o_rule() {
echo "$1" | sed -e 's/^\(.*\)\.m$/\1.o: \1.c/'
echo "$1" | sed -e 's/^\(.*\)\.m$/\1.o: Makefile config.mk/'
@@ -216,6 +223,11 @@ VER=0.1
echo "VER = $VER" >> ${CONFIG_MK}
echo "SRC_TOP = $SRC_TOP" >> ${CONFIG_MK}
+ENV_CPPFLAGS="$CPPFLAGS"
+ENV_CFLAGS="$CFLAGS"
+ENV_LDFLAGS="$LDFLAGS"
+ENV_LIBS="$LIBS"
+
if [ "x$CC" = "x" ]; then
if test -n $(which cc); then
CC=cc
diff --git a/libc3/configure b/libc3/configure
index 5469566..a2ae971 100755
--- a/libc3/configure
+++ b/libc3/configure
@@ -30,12 +30,6 @@ OBJECTS_ASAN="$(c2ext .asan.lo "$LO_SOURCES")"
OBJECTS_COV="$(c2ext .cov.lo "$LO_SOURCES")"
OBJECTS_DEBUG="$(c2ext .debug.lo "$LO_SOURCES")"
-# Default config
-ENV_CPPFLAGS="$CPPFLAGS"
-ENV_CFLAGS="$CFLAGS"
-ENV_LDFLAGS="$LDFLAGS"
-ENV_LIBS="$LIBS"
-
# Common config for all targets
CPPFLAGS="$CPPFLAGS -I../libffi/include"
CFLAGS="$CFLAGS -W -Wall -Werror -std=c99 -pedantic -fPIC"
@@ -143,10 +137,5 @@ for SRC in $SOURCES; do
done
update_config_mk
-
-CPPFLAGS="$ENV_CPPFLAGS"
-CFLAGS="$ENV_CFLAGS"
-LDFLAGS="$ENV_LDFLAGS"
-LIBS="$ENV_LIBS"
-
+env_reset
( cd window && ./configure; )
diff --git a/libc3/window/cairo/configure b/libc3/window/cairo/configure
index f8fba28..048492a 100755
--- a/libc3/window/cairo/configure
+++ b/libc3/window/cairo/configure
@@ -40,12 +40,6 @@ OBJECTS_ASAN="$(c2ext .asan.lo "$SOURCES")"
OBJECTS_COV="$(c2ext .cov.lo "$SOURCES")"
OBJECTS_DEBUG="$(c2ext .debug.lo "$SOURCES")"
-# Default config
-ENV_CPPFLAGS="$CPPFLAGS"
-ENV_CFLAGS="$CFLAGS"
-ENV_LDFLAGS="$LDFLAGS"
-ENV_LIBS="$LIBS"
-
# Common config for all targets
CPPFLAGS="$CPPFLAGS -I../../../libffi/include -I../../.."
CFLAGS="$CFLAGS -W -Wall -Werror -std=c99 -pedantic -fPIC"
@@ -151,11 +145,7 @@ fi
echo "HAVE_XCB = $HAVE_XCB" >> ${CONFIG_MK}
update_config_mk
-
-CPPFLAGS="$ENV_CPPFLAGS"
-CFLAGS="$ENV_CFLAGS"
-LDFLAGS="$ENV_LDFLAGS"
-LIBS="$ENV_LIBS"
+env_reset
if ${HAVE_SWIFT}; then
( cd quartz && ./configure; )
diff --git a/libc3/window/cairo/xcb/configure b/libc3/window/cairo/xcb/configure
index 3ed0c46..3fd18d2 100755
--- a/libc3/window/cairo/xcb/configure
+++ b/libc3/window/cairo/xcb/configure
@@ -40,17 +40,11 @@ OBJECTS_ASAN="$(c2ext .asan.lo "$SOURCES")"
OBJECTS_COV="$(c2ext .cov.lo "$SOURCES")"
OBJECTS_DEBUG="$(c2ext .debug.lo "$SOURCES")"
-# Default config
-ENV_CPPFLAGS="$CPPFLAGS"
-ENV_CFLAGS="$CFLAGS"
-ENV_LDFLAGS="$LDFLAGS"
-ENV_LIBS="$LIBS"
-LDFLAGS="--shared --no-undefined ${LDFLAGS}"
-LIBS="$LIBS -rpath ${PREFIX}/lib"
-
# Common config for all targets
-CFLAGS="$CFLAGS -W -Wall -Werror -std=c99 -pedantic -fPIC"
CPPFLAGS="$CPPFLAGS -I../../../../libffi/include -I../../../.."
+CFLAGS="$CFLAGS -W -Wall -Werror -std=c99 -pedantic -fPIC"
+LDFLAGS="--shared --no-undefined ${LDFLAGS}"
+LIBS="$LIBS -rpath ${PREFIX}/lib"
config_asan
config_gnu
pkg_config xcb
@@ -147,10 +141,5 @@ for SRC in $SOURCES; do
done
update_config_mk
-
-CPPFLAGS="$ENV_CPPFLAGS"
-CFLAGS="$ENV_CFLAGS"
-LDFLAGS="$ENV_LDFLAGS"
-LIBS="$ENV_LIBS"
-
+env_reset
( cd demo && ./configure; )
diff --git a/libc3/window/cairo/xcb/demo/configure b/libc3/window/cairo/xcb/demo/configure
index cb9a4f9..f2bb344 100755
--- a/libc3/window/cairo/xcb/demo/configure
+++ b/libc3/window/cairo/xcb/demo/configure
@@ -43,12 +43,6 @@ fi
OBJECTS_DEBUG="$(c2ext .debug.lo "$SOURCES")"
echo "OBJECTS_DEBUG = $OBJECTS_DEBUG" >> ${CONFIG_MK}
-# Default config
-ENV_CPPFLAGS="${CPPFLAGS}"
-ENV_CFLAGS="${CFLAGS}"
-ENV_LDFLAGS="${LDFLAGS}"
-ENV_LIBS="${LIBS}"
-
# Common config for all targets
CFLAGS="$CFLAGS -W -Wall -Werror -std=c99 -pedantic"
CPPFLAGS="$CPPFLAGS -I../../../../../libffi/include -I../../../../.."
diff --git a/libc3/window/configure b/libc3/window/configure
index 9d6f258..4f4cfdb 100755
--- a/libc3/window/configure
+++ b/libc3/window/configure
@@ -28,6 +28,7 @@ fi
echo "HAVE_CAIRO = $HAVE_CAIRO" >> ${CONFIG_MK}
update_config_mk
+env_reset
if ${HAVE_CAIRO}; then
( cd cairo && ./configure; )
diff --git a/test/buf_test.c b/test/buf_test.c
index 93c2c67..0b5607a 100644
--- a/test/buf_test.c
+++ b/test/buf_test.c
@@ -22,13 +22,11 @@
#define BUF_TEST_CLEAN(bufa) \
do { \
buf_clean(&bufa); \
- test_ok(); \
} while(0)
#define BUF_TEST_DELETE(buf) \
do { \
buf_delete(buf); \
- test_ok(); \
} while(0)
#define BUF_TEST_F(test, expected) \
@@ -370,7 +368,7 @@ TEST_CASE(buf_peek_s16)
s8 b[8];
s_buf buf;
s16 val;
- buf_init(&buf, false, sizeof(b), b); \
+ buf_init(&buf, false, sizeof(b), b);
TEST_EQ(buf_write_s16(&buf, 0), 2);
TEST_EQ(buf.rpos, 0);
TEST_EQ(buf.wpos, 2);
diff --git a/test/str_test.c b/test/str_test.c
index 5b6b3d8..b2355bd 100644
--- a/test/str_test.c
+++ b/test/str_test.c
@@ -146,7 +146,6 @@ TEST_CASE(str_init_clean)
TEST_EQ(stra.size, len);
TEST_STRNCMP(stra.ptr.p, "test", len);
str_clean(&stra);
- test_ok();
len = 4;
m = malloc(len);
assert(m);
@@ -155,7 +154,6 @@ TEST_CASE(str_init_clean)
TEST_EQ(stra.size, len);
TEST_STRNCMP(stra.ptr.p, "test", len);
str_clean(&stra);
- test_ok();
}
TEST_CASE_END(str_init_clean)
@@ -172,7 +170,6 @@ TEST_CASE(str_init_dup)
TEST_EQ(str.size, len);
TEST_STRNCMP(str.ptr.p, "test", len);
str_clean(&str);
- test_ok();
len = 4;
m = malloc(len);
assert(m);
@@ -183,7 +180,6 @@ TEST_CASE(str_init_dup)
TEST_EQ(str.size, len);
TEST_STRNCMP(str.ptr.p, "test", len);
str_clean(&str);
- test_ok();
}
TEST_CASE_END(str_init_dup)
@@ -197,7 +193,6 @@ TEST_CASE(str_init_dup_1)
TEST_EQ(str.size, len);
TEST_STRNCMP(str.ptr.p, "test", len);
str_clean(&str);
- test_ok();
len = 4;
m = malloc(len + 1);
assert(m);
@@ -207,7 +202,6 @@ TEST_CASE(str_init_dup_1)
TEST_EQ(str.size, len);
TEST_STRNCMP(str.ptr.p, "test", len);
str_clean(&str);
- test_ok();
}
TEST_CASE_END(str_init_dup_1)
@@ -308,7 +302,6 @@ TEST_CASE(str_new_delete)
TEST_EQ(str->size, len);
TEST_STRNCMP(str->ptr.p, "test", len);
str_delete(str);
- test_ok();
len = 4;
m = malloc(len);
memcpy(m, "test", len);
@@ -316,7 +309,6 @@ TEST_CASE(str_new_delete)
TEST_EQ(str->size, len);
TEST_STRNCMP(str->ptr.p, "test", len);
str_delete(str);
- test_ok();
}
TEST_CASE_END(str_new_delete)
@@ -333,7 +325,6 @@ TEST_CASE(str_new_dup)
TEST_EQ(str->size, len);
TEST_STRNCMP(str->ptr.p, "test", len);
str_delete(str);
- test_ok();
len = 4;
m = malloc(len);
memcpy(m, "test", len);
@@ -343,7 +334,6 @@ TEST_CASE(str_new_dup)
TEST_EQ(str->size, len);
TEST_STRNCMP(str->ptr.p, "test", len);
str_delete(str);
- test_ok();
}
TEST_CASE_END(str_new_dup)
diff --git a/test/tuple_test.c b/test/tuple_test.c
index 27cd644..2e94453 100644
--- a/test/tuple_test.c
+++ b/test/tuple_test.c
@@ -23,7 +23,6 @@
test_context("tuple_init(" # test ")"); \
TEST_EQ(tuple_init(&tuple_test, (test)), &tuple_test); \
tuple_clean(&tuple_test); \
- test_ok(); \
test_context(NULL); \
} while (0)
@@ -68,7 +67,6 @@
test_context("tuple_new(" # test ")"); \
TEST_ASSERT((tuple_test = tuple_new((test)))); \
tuple_delete(tuple_test); \
- test_ok(); \
test_context(NULL); \
} while (0)