From 752b340b5bd8d2217f91a4b19290751b16af4120 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Fri, 4 Nov 2016 11:06:13 -0700 Subject: [PATCH] Updated Jenkinsfile for iOS build --- Jenkinsfile | 23 +++++++++++------------ src/tap.cpp | 1 - 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 95d09d0..55d8f1a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,7 +32,6 @@ parallel 'centos7': { throw err } - // service (picoTCP IPv4) try { checkout scm @@ -102,17 +101,17 @@ parallel 'centos7': { } // ios_app_framework - //try { - // checkout scm - // stage('Build iOS App Framework') { - // sh 'make ios_app_framework' - // } - //} - //catch (err) { - // currentBuild.result = "FAILURE" - // slackSend color: '#ff0000', message: "${env.JOB_NAME} broken on iOS (<${env.BUILD_URL}|Open>)" - // throw err - //} + try { + checkout scm + stage('Build iOS App Framework') { + sh 'make ios_app_framework' + } + } + catch (err) { + currentBuild.result = "FAILURE" + slackSend color: '#ff0000', message: "${env.JOB_NAME} broken on iOS (<${env.BUILD_URL}|Open>)" + throw err + } } } diff --git a/src/tap.cpp b/src/tap.cpp index 313474a..337ed9e 100644 --- a/src/tap.cpp +++ b/src/tap.cpp @@ -395,7 +395,6 @@ void NetconEthernetTap::phyOnUnixData(PhySocket *sock, void **uptr, void *data, // Find job sockdata = jobmap[CANARY_num]; if(!sockdata.first) { - DEBUG_ERROR("unable to locate job entry for %lu, sock=%p", CANARY_num, (void*)&sock); return; } else foundJob = true;