Add user conan profile override variable, fix dist tests compilation

.dockerignore

@@ -2,4 +2,4 @@
 build
 venv
 docker/*.dockerfile
-
+conan-profile-user.txt

.env

@@ -1,5 +1,5 @@
-FAABRIC_VERSION=0.3.1
-FAABRIC_CLI_IMAGE=kubasz51/faasm-faabric:0.3.1
+FAABRIC_VERSION=0.4.0
+FAABRIC_CLI_IMAGE=kubasz51/faasm-faabric:0.4.0
 FAABRIC_BASE_CLI_IMAGE=kubasz51/faasm-faabric-base:0.4.0
 COMPOSE_PROJECT_NAME=faabric-dev
 CONAN_CACHE_MOUNT_SOURCE=./conan-cache/

.gitignore

@@ -109,3 +109,5 @@ __pycache__/
 *.pyc
 venv/
 *.egg-info/
+
+conan-profile-user.txt

cmake/ExternalProjects.cmake

@@ -73,7 +73,11 @@ if(NOT (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64"))
     set(FAABRIC_ARCH_SUFFIX "-${CMAKE_SYSTEM_PROCESSOR}")
 endif()
 
-set(FAABRIC_CONAN_PROFILE "${CMAKE_CURRENT_LIST_DIR}/../conan-profile${FAABRIC_ARCH_SUFFIX}.txt" CACHE FILEPATH "Faabric conan profile path" FORCE)
+if(FAABRIC_CONAN_PROFILE_OVERRIDE)
+    set(FAABRIC_CONAN_PROFILE "${CMAKE_CURRENT_LIST_DIR}/../${FAABRIC_CONAN_PROFILE_OVERRIDE}" CACHE FILEPATH "Faabric conan profile path" FORCE)
+else()
+    set(FAABRIC_CONAN_PROFILE "${CMAKE_CURRENT_LIST_DIR}/../conan-profile${FAABRIC_ARCH_SUFFIX}.txt" CACHE FILEPATH "Faabric conan profile path" FORCE)
+endif()
 
 conan_cmake_install(PATH_OR_REFERENCE .
                     BUILD outdated

tests/dist/DistTestExecutor.cpp

@@ -37,7 +37,7 @@ ExecutorFunction getDistTestExecutorCallback(const faabric::Message& msg)
 }
 
 DistTestExecutor::DistTestExecutor(faabric::Message& msg)
-  : Executor(msg)
+  : Executor(faabric::MessageInBatch(msg))
 {
     setUpDummyMemory(dummyMemorySize);
 }
@@ -95,7 +95,7 @@ void DistTestExecutor::setUpDummyMemory(size_t memSize)
 }
 
 std::shared_ptr<Executor> DistTestExecutorFactory::createExecutor(
-  faabric::Message& msg)
+  faabric::MessageInBatch msg)
 {
     return std::make_shared<DistTestExecutor>(msg);
 }

tests/dist/DistTestExecutor.h

@@ -40,9 +40,8 @@ class DistTestExecutor final : public faabric::scheduler::Executor
 
 class DistTestExecutorFactory : public faabric::scheduler::ExecutorFactory
 {
-  protected:
     std::shared_ptr<faabric::scheduler::Executor> createExecutor(
-      faabric::Message& msg) override;
+      faabric::MessageInBatch msg) override;
 };
 
 typedef int (*ExecutorFunction)(

tests/test/scheduler/test_executor.cpp

@@ -82,8 +82,8 @@ int32_t TestExecutor::executeTask(
     bool isThread = reqOrig->type() == faabric::BatchExecuteRequest::THREADS;
 
     // Check we're being asked to execute the function we've bound to
-    assert(msg.user() == boundMessage.user());
-    assert(msg.function() == boundMessage.function());
+    assert(msg.user() == boundMessage->user());
+    assert(msg.function() == boundMessage->function());
 
     // Custom thread-check function
     if (msg.function() == "thread-check" && !isThread) {