build: 32 bit linux ci

* in vector testsuite replaced EQUAL with DELTA for float comparison
* on linux use appsettings for testing
* botan deprecated warning
* template error in cxxtest

.gitlab-ci.yml

@@ -1,13 +1,31 @@
-image: st4ll1/coati_linux_64
-
 Linux64:
-  stage: deploy
+    image: st4ll1/coati_linux_64
-  only:
+    stage: deploy
-    - master
+    only:
-  script:
+        - master
-    - ./script/setup.sh
+    script:
-    - ./script/buildonly.sh package
+        - ./script/setup.sh
-  artifacts:
+        - ./script/buildonly.sh all
-    paths:
+        - ./script/buildonly.sh package
-      - distr
+    artifacts:
-    expire_in: 3 days
+        paths:
+            - distr
+        expire_in: 3 days
+
+Linux32:
+    image: st4ll1/coati_linux_32
+    stage: deploy
+    only
+        - master
+    script:
+        - ./script/setup.sh
+        - ./script/buildonly.sh all
+        - ./bin/app/Release/Coati --licenseFile ./setup/license.txt
+        - cd ./bin/test
+        - ./Release/Coati_test
+        - cd ../..
+        - ./script/buildonly.sh package
+    artifacts:
+        paths:
+            - distr/Coati*.tar.gz
+        expire_in: 3 days

CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
 
+#set (CMAKE_VERBOSE_MAKEFILE ON)
+
 include(cmake/add_files.cmake)
 include(cmake/create_source_groups.cmake)
 include(cmake/version.cmake)

script/buildonly.sh

@@ -41,6 +41,9 @@ then
 		cmake --build build/Release --target package
 		mkdir -p distr && mv build/Release/Coati*.tar.gz distr #&& cp build/Release/Coati*.deb distr
 		echo "Packages copied into the distr folder"
+elif [ "$1" = "all" ] || [ "$1" = "a" ]
+then
+	cmake --build build/Release --target all
 else
 	echo "no arguments: first argument 'release' or 'debug', second argument 'test' for tests"
 fi

src/lib/utility/scheduling/TaskReturnSuccessWhile.h

@@ -60,8 +60,9 @@ Task::TaskState TaskReturnSuccessWhile<T>::doUpdate(std::shared_ptr<Blackboard>
 			return STATE_SUCCESS;
 		}
 		break;
+	default:
+		return STATE_FAILURE;
 	}
-
 	return STATE_FAILURE;
 }
 

src/lib_gui/qt/window/QtStartScreen.cpp

@@ -72,7 +72,7 @@ void QtRecentProjectButton::handleButtonClick()
 			emit updateButtons();
 		}
 	}
-};
+}
 
 
 QtStartScreen::QtStartScreen(QWidget *parent)

src/lib_license/License.cpp

@@ -104,7 +104,7 @@ void License::create(
 	createMessage(user, version, type);
 
 	//encode message
-	Botan::PK_Signer signer(*privateKey, "EMSA4(SHA-256)");
+	Botan::PK_Signer signer(*privateKey, *(m_rng.get()), "EMSA4(SHA-256)");
 	Botan::DataSource_Memory in(getMessage());
 	Botan::byte buf[4096] = {0};
 	while (size_t got = in.read(buf, sizeof(buf))) {

src/test/CxxParserTestSuite.h

@@ -2285,7 +2285,7 @@ public:
 			"class B\n"
 			"{\n"
 			"public:\n"
-			"	typedef typename A<U>::type<float> type;\n"
+			"	typedef typename A<U>::template type<float> type;\n"
 			"};\n"
 		);
 

src/test/TestSuiteFixture.cpp

@@ -16,6 +16,8 @@ TestSuiteFixture::~TestSuiteFixture()
 {
 }
 
+#include <iostream>
+
 bool TestSuiteFixture::setUpWorld()
 {
 	LogManager* logManager = LogManager::createInstance().get();
@@ -24,7 +26,28 @@ bool TestSuiteFixture::setUpWorld()
 	logManager->addLogger(std::make_shared<PlainFileLogger>("data/log/test_log.txt"));
 	logManager->addLogger(std::make_shared<FileLogger>());
 
+#ifdef __linux__
+	const std::string homedir = getenv("HOME");
+
+	if (!homedir.empty())
+	{
+		if(!ApplicationSettings::getInstance()->load(
+			FilePath(homedir + "/.config/coati/ApplicationSettings.xml")
+		))
+		{
+			std::cout << "no settings" << std::endl;
+			return false;
+		}
+	}
+	else
+	{
+		std::cout << "no homedir" << std::endl;
+		return false;
+	}
+
+#else
 	ApplicationSettings::getInstance()->load(FilePath("data/TestSettings.xml"));
+#endif
 
 	return true;
 }

src/test/Vector2TestSuite.h

@@ -72,8 +72,8 @@ public:
 		float targetX = x / std::sqrt(x * x + y * y);
 		float targetY = y / std::sqrt(x * x + y * y);
 		vec0.normalize();
-		TS_ASSERT_EQUALS(targetX, vec0.x);
+		TS_ASSERT_DELTA(targetX, vec0.x, 1e-7);
-		TS_ASSERT_EQUALS(targetY, vec0.y);
+		TS_ASSERT_DELTA(targetY, vec0.y, 1e-7);
 	}
 
 	void test_vector2_comparison()