Skip to content

Commit 68a3e6a

Browse files
committed
Fix test build errors
1 parent 540c3dd commit 68a3e6a

File tree

3 files changed

+57
-6
lines changed

3 files changed

+57
-6
lines changed

Makefile

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
CC = gcc
2-
CFLAGS = -Wall -Wextra -O3 -I. -I/opt/homebrew/Cellar/googletest/1.14.0/include
3-
LDFLAGS = -L. -ldsc -lm -L/opt/homebrew/Cellar/googletest/1.14.0/lib -lgtest
2+
CFLAGS = -Wall -Wextra -O3 -I.
3+
4+
# Check if googletest is available
5+
GTEST_DIR = /opt/homebrew/Cellar/googletest/1.14.0
6+
ifneq ($(wildcard $(GTEST_DIR)),)
7+
CFLAGS += -I$(GTEST_DIR)/include
8+
GTEST_LDFLAGS = -L$(GTEST_DIR)/lib -lgtest
9+
else
10+
GTEST_LDFLAGS =
11+
endif
12+
13+
LDFLAGS = -L. -ldsc -lm
414

515
LIBNAME = libdsc.a
616
SONAME = libdsc.so
@@ -52,7 +62,7 @@ test: $(LIBNAME) $(TESTS)
5262
build-tests: $(TESTS)
5363

5464
tests/test_dsc_list: tests/test_dsc_list.c $(LIBNAME)
55-
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(RPATH)
65+
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(GTEST_LDFLAGS) $(RPATH)
5666

5767
tests/test_dsc_vector: tests/test_dsc_vector.c $(LIBNAME)
5868
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(RPATH)
@@ -61,13 +71,13 @@ tests/test_dsc_stack: tests/test_dsc_stack.c $(LIBNAME)
6171
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(RPATH)
6272

6373
tests/test_dsc_queue: tests/test_dsc_queue.c $(LIBNAME)
64-
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(RPATH)
74+
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(GTEST_LDFLAGS) $(RPATH)
6575

6676
tests/test_dsc_map: tests/test_dsc_map.c $(LIBNAME)
67-
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(RPATH)
77+
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(GTEST_LDFLAGS) $(RPATH)
6878

6979
tests/test_dsc_set: tests/test_dsc_set.c $(LIBNAME)
70-
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(RPATH)
80+
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(GTEST_LDFLAGS) $(RPATH)
7181

7282
$(TESTS): $(LIBNAME)
7383

tests/test_dsc_list.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,20 @@
11
// SPDX-License-Identifier: GPL-3.0-or-later
2+
3+
#include <stdlib.h>
4+
#include <assert.h>
5+
#include <stdio.h>
6+
7+
#include "../include/dsc_list.h"
8+
9+
// Basic initialization test
10+
void test_dsc_list_init_deinit(void) {
11+
DSCList *list = dsc_list_init(DSC_TYPE_INT);
12+
assert(list != NULL);
13+
assert(dsc_list_deinit(list) == DSC_ERROR_OK);
14+
}
15+
16+
int main(void) {
17+
test_dsc_list_init_deinit();
18+
printf("All tests passed!\n");
19+
return EXIT_SUCCESS;
20+
}

tests/test_dsc_map.c

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,23 @@
11
// SPDX-License-Identifier: GPL-3.0-or-later
2+
3+
#include <stdlib.h>
4+
#include <assert.h>
5+
#include <stdio.h>
6+
7+
#include "../include/dsc_map.h"
8+
9+
// Basic initialization test
10+
void test_dsc_map_init_deinit(void) {
11+
DSCMap *map = NULL;
12+
map = (DSCMap*)malloc(sizeof(DSCMap));
13+
assert(map != NULL);
14+
assert(dsc_map_init(map, DSC_TYPE_INT, DSC_TYPE_STRING) == DSC_ERROR_OK);
15+
assert(dsc_map_deinit(map) == DSC_ERROR_OK);
16+
free(map);
17+
}
18+
19+
int main(void) {
20+
test_dsc_map_init_deinit();
21+
printf("All tests passed!\n");
22+
return EXIT_SUCCESS;
23+
}

0 commit comments

Comments
 (0)