commit 1607d9596c40962e1275a30aec311af6e0774874
parent 7b136ce4b58e78a450393403a51bf5f8db82b937
Author: lash <dev@holbrook.no>
Date: Sun, 30 Mar 2025 14:29:14 +0100
Add test provisions helper
Diffstat:
7 files changed, 127 insertions(+), 11 deletions(-)
diff --git a/src/aux/liblash/src/rerr/rerr.c b/src/aux/liblash/src/rerr/rerr.c
@@ -30,7 +30,6 @@ char *rerr_base[3] = {
void rerr_init(const char *coreprefix) {
#ifdef RERR
int i;
- char *rerr_x;
for (i = 1; i < RERR_N_PFX + 1; i++) {
rerr[i] = 0x0;
diff --git a/src/crypto/gcrypt.c b/src/crypto/gcrypt.c
@@ -599,7 +599,6 @@ static int key_from_store(struct gpg_store *gpg, const char *passphrase, size_t
static int gpg_key_load(struct gpg_store *gpg, const char *passphrase, size_t passphrase_len, enum gpg_find_mode_e mode, const void *criteria) {
int r;
- char *p;
switch(mode) {
case GPG_FIND_MAIN:
diff --git a/src/io/Makefile b/src/io/Makefile
@@ -3,6 +3,7 @@ CFLAGS += $(INCLUDES) -Wall
std:
$(CC) $(CFLAGS) -g3 -c std.c
+ $(CC) $(CFLAGS) -g3 -c dummy.c
clean:
rm -vf *.o
diff --git a/src/io/dummy.c b/src/io/dummy.c
@@ -0,0 +1,3 @@
+char *mktempdir(char *s) {
+ return s;
+}
diff --git a/src/store/mem.c b/src/store/mem.c
@@ -1,8 +1,11 @@
#include <hashmap.h>
+#include <llog.h>
#include "lq/mem.h"
#include "lq/store.h"
#include "lq/err.h"
+#include "lq/io.h"
+#include "debug.h"
static const int store_typ_mem = 2;
@@ -51,7 +54,7 @@ static long unsigned int pair_hash(const void *item, long unsigned int s0, long
struct hashmap* lq_mem_init(LQStore *store) {
if (store->userdata == NULL) {
- store->userdata = (void*)hashmap_new(sizeof(struct pair_t) , 0, 0, 0, pair_hash, pair_cmp, NULL, NULL);
+ store->userdata = (void*)hashmap_new(sizeof(struct pair_t) , 1024*1024, 0, 0, pair_hash, pair_cmp, NULL, NULL);
}
return (struct hashmap *)store->userdata;
}
@@ -60,11 +63,16 @@ int lq_mem_content_get(enum payload_e typ, LQStore *store, const char *key, size
struct hashmap *o;
struct pair_t v;
const struct pair_t *p;
+ char path[LQ_PATH_MAX];
o = lq_mem_init(store);
- v.key = key;
- v.key_len = key_len;
+ path[0] = (char)typ;
+ lq_cpy(path+1, key, key_len);
+ v.key = path;
+ v.key_len = key_len + 1;
+
+ debug_x(LLOG_DEBUG, "store.mem", "store get req", 1, MORGEL_TYP_BIN, v.key_len, "key", v.key);
p = hashmap_get(o, &v);
if (p == NULL) {
@@ -73,20 +81,28 @@ int lq_mem_content_get(enum payload_e typ, LQStore *store, const char *key, size
*value_len = p->val_len;
lq_cpy(value, p->val, *value_len);
+ debug_x(LLOG_DEBUG, "store.mem", "store get res", 2, MORGEL_TYP_BIN, v.key_len, "key", v.key, MORGEL_TYP_NUM, 0, "bytes", *value_len);
+
return ERR_OK;
}
int lq_mem_content_put(enum payload_e typ, LQStore *store, const char *key, size_t *key_len, char *value, size_t value_len) {
struct hashmap *o;
struct pair_t v;
+ char path[LQ_PATH_MAX];
- v.key = key;
- v.key_len = *key_len;
+ path[0] = (char)typ;
+ lq_cpy(path+1, key, *key_len);
+ v.key = path;
+ v.key_len = *key_len + 1;
v.val = value;
v.val_len = value_len;
o = lq_mem_init(store);
hashmap_set(o, &v);
+
+ debug_x(LLOG_DEBUG, "store.mem", "store put", 2, MORGEL_TYP_BIN, v.key_len, "key", v.key, MORGEL_TYP_NUM, 0, "bytes", value_len);
+
return ERR_OK;
}
@@ -108,6 +124,7 @@ struct lq_store_t LQMemContent = {
LQStore* lq_store_new(const char *spec) {
LQStore *store;
+ debug(LLOG_DEBUG, "store.mem", "ignoring spec in mem store init");
store = lq_alloc(sizeof(LQStore));
lq_cpy(store, &LQMemContent, sizeof(LQMemContent));
return store;
diff --git a/src/test/Makefile b/src/test/Makefile
@@ -1,12 +1,13 @@
OBJS := $(patsubst %.c,%.o,$(wildcard *.c))
INCLUDES := -I.. -I../aux/include `pkg-config --cflags libtasn1 libgcrypt`
CFLAGS += $(INCLUDES) -Wall -g3
-LIBS := ../asn1/defs_asn1_tab.o `pkg-config --libs libtasn1 libgcrypt` -L../aux/lib -llash
+LIBS := ../asn1/defs_asn1_tab.o `pkg-config --libs libtasn1 libgcrypt` -L../aux/lib -llash -lhashmap
#LDFLAGS := -lcheck -lsubunit -lm $(LIBS)
LDFLAGS := -lcheck $(LIBS)
COMMONOBJS = ../mem/std.o ../lq/config.o ../lq/err.o ../lq/base.o ../debug.o
all: build
+ CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_test_bin
CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_debug_bin
CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_config_bin
CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_crypto_bin
@@ -18,17 +19,19 @@ all: build
test: all
build:
+ $(CC) $(CFLAGS) test_test.c -o test_test_bin $(COMMONOBJS) ../io/dummy.o ../store/mem.o $(LDFLAGS)
$(CC) $(CFLAGS) test_debug.c -o test_debug_bin $(COMMONOBJS) $(LDFLAGS)
$(CC) $(CFLAGS) test_config.c -o test_config_bin $(COMMONOBJS) $(LDFLAGS)
# $(CC) $(CFLAGS) test_crypto.c -o test_crypto_bin ../crypto/dummy.o ../mem/std.o $(LDFLAGS)
# $(CC) $(CFLAGS) test_msg.c -o test_msg_bin ../crypto/dummy.o ../mem/std.o ../store/dummy.o ../store/file.o ../io/std.o ../lq/msg.o $(LDFLAGS)
#$(CC) $(CFLAGS) test_cert.c -o test_cert_bin ../crypto/dummy.o ../mem/std.o ../store/dummy.o ../store/file.o ../io/std.o ../lq/msg.o ../lq/cert.o $(LDFLAGS)
#$(CC) $(CFLAGS) test_trust.c -o test_trust_bin ../crypto/dummy.o ../mem/std.o ../store/mem.o ../lq/trust.o -lhashmap $(LDFLAGS)
- $(CC) $(CFLAGS) test_crypto.c -o test_crypto_bin $(COMMONOBJS) ../store/file.o ../io/std.o ../crypto/gcrypt.o $(LDFLAGS) -lgcrypt
+ #$(CC) $(CFLAGS) test_crypto.c -o test_crypto_bin $(COMMONOBJS) ../store/file.o ../io/std.o ../crypto/gcrypt.o $(LDFLAGS) -lgcrypt
+ $(CC) $(CFLAGS) test_crypto.c -o test_crypto_bin $(COMMONOBJS) ../store/mem.o ../io/std.o ../crypto/gcrypt.o $(LDFLAGS) -lgcrypt
$(CC) $(CFLAGS) test_msg.c -o test_msg_bin $(COMMONOBJS) ../store/file.o ../store/dummy.o ../io/std.o ../crypto/gcrypt.o ../lq/msg.o $(LDFLAGS)
$(CC) $(CFLAGS) test_cert.c -o test_cert_bin $(COMMONOBJS) ../store/file.o ../io/std.o ../crypto/gcrypt.o ../store/dummy.o ../lq/msg.o ../lq/cert.o $(LDFLAGS)
- $(CC) $(CFLAGS) test_trust.c -o test_trust_bin $(COMMONOBJS) ../store/mem.o ../crypto/gcrypt.o ../lq/trust.o -lhashmap $(LDFLAGS)
- $(CC) $(CFLAGS) test_store.c -o test_store_bin $(COMMONOBJS) ../store/file.o ../io/std.o ../crypto/gcrypt.o -lhashmap $(LDFLAGS)
+ $(CC) $(CFLAGS) test_trust.c -o test_trust_bin $(COMMONOBJS) ../store/mem.o ../crypto/gcrypt.o ../lq/trust.o $(LDFLAGS)
+ $(CC) $(CFLAGS) test_store.c -o test_store_bin $(COMMONOBJS) ../store/file.o ../io/std.o ../crypto/gcrypt.o $(LDFLAGS)
clean:
rm -vf test_*_bin
diff --git a/src/test/test_test.c b/src/test/test_test.c
@@ -0,0 +1,94 @@
+#include <check.h>
+#include <stdlib.h>
+
+#include "lq/base.h"
+#include "lq/io.h"
+#include "lq/mem.h"
+#include "lq/store.h"
+
+// sha256sum "foo" 2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae
+static const char foosum[32] = {
+ 0x2c, 0x26, 0xb4, 0x6b, 0x68, 0xff, 0xc6, 0x8f,
+ 0xf9, 0x9b, 0x45, 0x3c, 0x1d, 0x30, 0x41, 0x34,
+ 0x13, 0x42, 0x2d, 0x70, 0x64, 0x83, 0xbf, 0xa0,
+ 0xf9, 0x8a, 0x5e, 0x88, 0x62, 0x66, 0xe7, 0xae,
+};
+
+
+START_TEST(check_hashmap) {
+ LQStore *store;
+ char path[LQ_PATH_MAX];
+ const char *k;
+ size_t kl;
+ char *v;
+ size_t vl;
+ int i;
+ char out[8192];
+ char in[8192];
+
+ lq_cpy(path, "/tmp/lq_test_XXXXXX", 20);
+ store = lq_store_new(mktempdir(path));
+ ck_assert_ptr_nonnull(store);
+
+ k = "foo";
+ kl = 3;
+ v = "bar";
+ vl = 3;
+ store->put(LQ_CONTENT_RAW, store, k, &kl, v, vl);
+
+ v = out;
+ vl = 8192;
+ store->get(LQ_CONTENT_RAW, store, k, kl, v, &vl);
+
+ k = foosum;
+ kl = 32;
+ for (i = 0; i < 8192; i++) {
+ in[i] = i % 256;
+ }
+ v = in;
+ vl = 8192;
+ store->put(LQ_CONTENT_KEY, store, k, &kl, v, vl);
+
+ v = out;
+ store->get(LQ_CONTENT_KEY, store, k, kl, v, &vl);
+
+ ck_assert_mem_eq(in, out, 8192);
+
+ lq_store_free(store);
+}
+END_TEST
+
+
+Suite * common_suite(void) {
+ Suite *s;
+ TCase *tc;
+
+ s = suite_create("test");
+ tc = tcase_create("provisions");
+ tcase_add_test(tc, check_hashmap);
+ suite_add_tcase(s, tc);
+
+ return s;
+}
+
+int main(void) {
+ int r;
+ int n_fail;
+
+ Suite *s;
+ SRunner *sr;
+
+ r = lq_init();
+ if (r) {
+ return 1;
+ }
+
+ s = common_suite();
+ sr = srunner_create(s);
+
+ srunner_run_all(sr, CK_VERBOSE);
+ n_fail = srunner_ntests_failed(sr);
+ srunner_free(sr);
+
+ return (n_fail == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
