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

Merged in develop and cleaned up system test fixture

parents daa2e363 050745df

.travis.yml

+5 −1
Original line number Diff line number Diff line
@@ -5,7 +5,11 @@ os: 
compiler:

  - clang

  - gcc

install:

before_script:

  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y

  - sudo apt-get update -qq

  - sudo apt-get install -y gcc-4.8

  - if [ $CC == 'gcc' ]; then export CC=gcc-4.8; fi;

  - bundle install

script:

  - make start_simulator

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -362,7 +362,8 @@ $(SYSTEST_OUT)/%.testpass : $(SYSTEST_OUT)/run_% 


$(systest_names) : % : $(SYSTEST_OUT)/%.testpass



system_tests: $(systest_passfiles)

system_tests: $(systest_passfiles) $(KINETIC_LIB)





#===============================================================================

# Test Utility Build Support

src/lib/kinetic_operation.c

+2 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ static KineticStatus KineticOperation_SendRequestInner(KineticOperation* const o 
        .msg_size = offset,

        .cb       = KineticController_HandleExpectedResponse,

        .udata    = operation,

        .timeout_sec = operation->timeoutSeconds,

    });



    free(msg);
@@ -705,6 +706,7 @@ void KineticOperation_BuildInstantSecureErase(KineticOperation* operation) 
    operation->sendValue = false;

    operation->callback = &KineticOperation_InstantSecureEraseCallback;

    operation->request->pinOp = true;

    operation->timeoutSeconds = 180;

}



KineticStatus KineticOperation_SetClusterVersionCallback(KineticOperation* operation,

src/lib/kinetic_session.c

+4 −0
Original line number Diff line number Diff line
@@ -35,16 +35,20 @@ 


KineticStatus KineticSession_Create(KineticSession * const session, KineticClient * const client)

{

    LOG_LOCATION;

    if (session == NULL) {

        LOG0("Session is NULL");

        return KINETIC_STATUS_SESSION_EMPTY;

    }



    if (client == NULL) {

        LOG0("Client is NULL");

        return KINETIC_STATUS_SESSION_EMPTY;

    }



    session->connection = KineticAllocator_NewConnection();

    if (session->connection == NULL) {

        LOG0("Failed allocating a new connection instance");

        return KINETIC_STATUS_MEMORY_ERROR;

    }

src/lib/kinetic_types_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ struct _KineticOperation { 
    KineticResponse* response;

    bool valueEnabled;

    bool sendValue;

    uint16_t timeoutSeconds;

    KineticEntry* entry;

    ByteBufferArray* buffers;

    KineticDeviceInfo** deviceInfo;