Commit 200dbe36 authored by Greg Williams's avatar Greg Williams
Browse files

Merge branch 'develop' of github.com:Seagate/kinetic-c into develop

parents 6cd2c444 2ad7ab1a

Makefile

+1 −4
Original line number Diff line number Diff line
@@ -225,14 +225,11 @@ JAVA_BIN = $(JAVA_HOME)/bin/java 


.PHONY: test



test_internals: test_threadpool test_bus

test_internals: test_threadpool



test_threadpool:

	cd ${LIB_DIR}/threadpool && make test



test_bus: test_threadpool ${OUT_DIR}/libsocket99.a ${OUT_DIR}/libthreadpool.a

	cd ${LIB_DIR}/bus && make test



#-------------------------------------------------------------------------------

# Internal Libraries

#-------------------------------------------------------------------------------

src/lib/bus/Makefile

+1 −7
Original line number Diff line number Diff line
@@ -27,10 +27,7 @@ ECHOSRV_OBJS = \ 
	echosrv.o \

	util.o \



all: bus.png test_yacht echosrv bus_example



test: test_yacht

	./test_yacht

all: bus.png echosrv bus_example



%.png: %.dot

	dot -Tpng -o $@ $^
@@ -38,9 +35,6 @@ test: test_yacht 
libbus.a: ${BUS_OBJS}

	ar -rcs $@ $^



test_yacht: test_yacht.o yacht.o

	${CC} -o $@ $^ ${LDFLAGS}



echosrv: ${ECHOSRV_OBJS}

	${CC} -o $@ $^ ${LDFLAGS}

src/lib/bus/greatest.h

deleted100644 → 0
+0 −661

File deleted.

Preview size limit exceeded, changes collapsed.

src/lib/threadpool/greatest.h

deleted100644 → 0
+0 −661

File deleted.

Preview size limit exceeded, changes collapsed.

test/unit/test_bus_send.c

+2 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include "send_internal.h"

#include "atomic.h"



#include <stdlib.h>

#include <errno.h>



#include "mock_bus.h"
@@ -94,9 +93,9 @@ void test_send_do_blocking_send_should_reject_message_if_listener_notify_fails(v 
}



static void expect_handle_failure(void) {

    backpressure = random();

    backpressure = 54321;

    bus_process_boxed_message_ExpectAndReturn(b, box, &backpressure, true);

    bus_backpressure_delay_Expect(b, backpressure, LISTENER_EXPECT_BACKPRESSURE_SHIFT);

    bus_backpressure_delay_Expect(b, 54321, LISTENER_EXPECT_BACKPRESSURE_SHIFT);

}



void test_send_do_blocking_send_should_set_TX_FAILURE_if_second_timestamp_failure(void) {