You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ab...@apache.org on 2021/06/07 12:48:29 UTC
[nifi-minifi-cpp] branch main updated (72e9c9e -> 33d65ed)
This is an automated email from the ASF dual-hosted git repository.
aboda pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git.
from 72e9c9e Squashed commit of the following:
new e51192e MINIFICPP-1582 fixing build falure in centos ci job
new 33d65ed MINIFICPP-1583 windows build fix
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docker/centos/Dockerfile | 4 ++--
extensions/pdh/tests/PerformanceDataMonitorTests.cpp | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
[nifi-minifi-cpp] 01/02: MINIFICPP-1582 fixing build falure in
centos ci job
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aboda pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit e51192ed9639c04d69252fa033b444373173a00b
Author: Martin Zink <ma...@protonmail.com>
AuthorDate: Fri Jun 4 15:56:04 2021 +0200
MINIFICPP-1582 fixing build falure in centos ci job
centos cmake symbol lookup error fix
Signed-off-by: Arpad Boda <ab...@apache.org>
This closes #1099
---
docker/centos/Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile
index e54ab4c..b6284c1 100644
--- a/docker/centos/Dockerfile
+++ b/docker/centos/Dockerfile
@@ -27,7 +27,7 @@ ARG MINIFI_VERSION
ENV MINIFI_BASE_DIR /opt/minifi
ENV MINIFI_HOME $MINIFI_BASE_DIR/nifi-minifi-cpp-$MINIFI_VERSION
-RUN yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel python36-devel gcc gcc-c++ sudo git which maven make cmake
+RUN yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel python36-devel gcc gcc-c++ sudo git which maven make cmake libarchive
RUN mkdir -p $MINIFI_BASE_DIR
COPY . ${MINIFI_BASE_DIR}
@@ -40,6 +40,6 @@ RUN cd $MINIFI_BASE_DIR \
&& rm -rf build \
&& mkdir build \
&& cd build \
- && cmake3 -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON -DENABLE_COAP=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=$ENABLE_JNI .. \
+ && cmake -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON -DENABLE_COAP=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=$ENABLE_JNI .. \
&& make -j$(nproc) package
[nifi-minifi-cpp] 02/02: MINIFICPP-1583 windows build fix
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aboda pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 33d65edb3f005a17f3edbfd6fdcf9401605da568
Author: Martin Zink <ma...@protonmail.com>
AuthorDate: Fri Jun 4 17:59:39 2021 +0200
MINIFICPP-1583 windows build fix
Signed-off-by: Arpad Boda <ab...@apache.org>
This closes #1100
---
extensions/pdh/tests/PerformanceDataMonitorTests.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/extensions/pdh/tests/PerformanceDataMonitorTests.cpp b/extensions/pdh/tests/PerformanceDataMonitorTests.cpp
index b3d5acd..cb49bab 100644
--- a/extensions/pdh/tests/PerformanceDataMonitorTests.cpp
+++ b/extensions/pdh/tests/PerformanceDataMonitorTests.cpp
@@ -250,16 +250,16 @@ TEST_CASE("PerformanceDataMonitorDecimalPlacesPropertyTest", "[performancedatamo
{
PerformanceDataMonitorTester tester;
tester.setPerformanceMonitorProperty(PerformanceDataMonitor::DecimalPlaces, "asd");
- REQUIRE_THROWS_WITH(tester.runProcessors(), "General Operation: Invalid conversion to int64_t for asd");
+ REQUIRE_THROWS_WITH(tester.runWithRetries([]{ return true; }, 1), "General Operation: Invalid conversion to int64_t for asd");
}
{
PerformanceDataMonitorTester tester;
tester.setPerformanceMonitorProperty(PerformanceDataMonitor::DecimalPlaces, "1234586123");
- REQUIRE_THROWS_WITH(tester.runProcessors(), "Process Schedule Operation: PerformanceDataMonitor Decimal Places is out of range");
+ REQUIRE_THROWS_WITH(tester.runWithRetries([]{ return true; }, 1), "Process Schedule Operation: PerformanceDataMonitor Decimal Places is out of range");
}
{
PerformanceDataMonitorTester tester;
tester.setPerformanceMonitorProperty(PerformanceDataMonitor::DecimalPlaces, "");
- REQUIRE_NOTHROW(tester.runProcessors());
+ REQUIRE_NOTHROW(tester.runWithRetries([]{ return true; }, 1));
}
}