Commit cfd81c88 authored by Greg Williams's avatar Greg Williams
Browse files

Fixed some build issues likely from merge

parent 73116a75

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ test_bus: test_threadpool ${OUT_DIR}/libsocket99.a ${OUT_DIR}/libthreadpool.a 
#-------------------------------------------------------------------------------



${OUT_DIR}/libsocket99.a: ${SOCKET99}/*.[ch]

	cd ${SOCKET99} && make all

	cd ${SOCKET99} && make CDEFS=\"-D_C99_SOURCE=1\" all

	cp ${SOCKET99}/libsocket99.a $@



${OUT_DIR}/libthreadpool.a: ${LIB_DIR}/threadpool/*.[ch]
@@ -311,7 +311,7 @@ unit_tests: start_simulator $(unit_passfiles) 
SYSTEST_SRC = ./test/system

SYSTEST_OUT = $(BIN_DIR)/systest

SYSTEST_LDFLAGS += -lm -l ssl $(KINETIC_LIB) -l crypto -l pthread

SYSTEST_WARN = -Wall -Wextra -Wstrict-prototypes -pedantic -Wno-missing-field-initializers -Werror=strict-prototypes

SYSTEST_WARN = -Wall -Wextra -Wstrict-prototypes -pedantic -Wno-missing-field-initializers -Werror=strict-prototypes -Wno-nonnull

SYSTEST_CFLAGS += -std=c99 -fPIC -g $(SYSTEST_WARN) $(CDEFS) $(OPTIMIZE) -DTEST



systest_sources = $(wildcard $(SYSTEST_SRC)/*.c)

src/lib/threadpool/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ test: lib${PROJECT}.a ./test_${PROJECT} 
	./test_${PROJECT}



clean:

	rm -f ${PROJECT} test_${PROJECT} test_${PROJECT}_stress test_${PROJECT}_sequencing.c *.o *.a *.core

	rm -f ${PROJECT} test_${PROJECT} test_${PROJECT}_stress test_${PROJECT}_sequencing *.o *.a *.core



# Installation

PREFIX ?=	/usr/local

test/unit/test_kinetic_client.c

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ static KineticSession Session; 
static KineticConnection Connection;

static const int64_t ClusterVersion = 1234;

static const int64_t Identity = 47;

static ByteArray HmacKey;



void setUp(void)

{