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

Fixed some linux build issues

parent 7e73f009

src/lib/kinetic_pdu.c

+1 −6
Original line number Diff line number Diff line
@@ -190,12 +190,7 @@ bool KineticPDU_Receive(KineticPDU* const response) 
        response->message.status.code = 

            KINETIC_PROTO_STATUS_STATUS_CODE_DATA_ERROR;

            

        // FIXME!!

        return false;

        // .. but allow HMAC validation to report the error

        // return false;

        // Return true for now until HMAC validation is fixed!

        // return true;

    }

    else

    {

test/integration/test_integration_get.c

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static KineticOperation Operation; 
static ByteArray RequestHeader;

static ByteArray ResponseHeaderRaw;

static ByteArray ResponseProtobuf;

static ByteArray HMACKey = BYTE_ARRAY_INIT_FROM_CSTRING("some_hmac_key");

static ByteArray HMACKey;



void setUp(void)

{
@@ -49,6 +49,7 @@ void setUp(void) 
    const int64_t clusterVersion = 9876;

    const int64_t identity = 1234;

    const int socketDesc = 783;

    HMACKey = BYTE_ARRAY_INIT_FROM_CSTRING("some_hmac_key");



    KineticClient_Init(NULL);

test/integration/test_integration_noop.c

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static KineticOperation Operation; 
static ByteArray RequestHeader;

static ByteArray ResponseHeaderRaw;

static ByteArray ResponseProtobuf;

static ByteArray HMACKey = BYTE_ARRAY_INIT_FROM_CSTRING("some_hmac_key");

static ByteArray HMACKey;



void setUp(void)

{
@@ -49,6 +49,7 @@ void setUp(void) 
    const int64_t clusterVersion = 9876;

    const int64_t identity = 1234;

    const int socketDesc = 783;

    HMACKey = BYTE_ARRAY_INIT_FROM_CSTRING("some_hmac_key");



    KineticClient_Init(NULL);

test/integration/test_integration_put.c

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static KineticOperation Operation; 
static ByteArray RequestHeader;

static ByteArray ResponseHeaderRaw;

static ByteArray ResponseProtobuf;

static ByteArray HMACKey = BYTE_ARRAY_INIT_FROM_CSTRING("some_hmac_key");

static ByteArray HMACKey;



void setUp(void)

{
@@ -49,6 +49,7 @@ void setUp(void) 
    const int64_t clusterVersion = 9876;

    const int64_t identity = 1234;

    const int socketDesc = 783;

    HMACKey = BYTE_ARRAY_INIT_FROM_CSTRING("some_hmac_key");



    KineticClient_Init(NULL);

test/integration/test_kinetic_socket.c

+3 −4
Original line number Diff line number Diff line
@@ -45,10 +45,8 @@ 
#include <stdio.h>



static int FileDesc;

static int KineticTestPort = KINETIC_PORT /*8999*/;

static ByteArray TestData =

    BYTE_ARRAY_INIT_FROM_CSTRING("Some like it hot!");

// static KineticPDU PDU;

static int KineticTestPort = KINETIC_PORT;

static ByteArray TestData;

static bool LogInitialized = false;



void setUp(void)
@@ -59,6 +57,7 @@ void setUp(void) 
        KineticLogger_Init(NULL);//"test_kinetic_socket.log");

        LogInitialized = true;

    }

    TestData = BYTE_ARRAY_INIT_FROM_CSTRING("Some like it hot!")

}



void tearDown(void)