Resolve merge conflict

uniba-swt · Sep 18, 2023 · 60cf26d · 60cf26d
2 parents ced6175 + 56ba7be
commit 60cf26d
Show file tree

Hide file tree

Showing 10 changed files with 603 additions and 751 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -135,10 +135,10 @@ IF (${BIDIB_USE_TESTS})
 
 	# Physical test
 
-	ADD_EXECUTABLE(swtbahn-standard-testsuite test test/physical/swtbahn-standard/main.c test/physical/swtbahn-standard/testsuite.c)
+	ADD_EXECUTABLE(swtbahn-standard-testsuite test test/physical/swtbahn-standard/main.c test/physical/swtbahn-standard/testsuite.c test/physical/test_common.c)
 	TARGET_LINK_LIBRARIES(swtbahn-standard-testsuite glib-2.0 pthread yaml bidib_static)
 
-	ADD_EXECUTABLE(swtbahn-full-testsuite test test/physical/swtbahn-full/main.c test/physical/swtbahn-full/testsuite.c)
+	ADD_EXECUTABLE(swtbahn-full-testsuite test test/physical/swtbahn-full/main.c test/physical/swtbahn-full/testsuite.c test/physical/test_common.c)
 	TARGET_LINK_LIBRARIES(swtbahn-full-testsuite glib-2.0 pthread yaml bidib_static)
 
 ENDIF(${BIDIB_USE_TESTS})

diff --git a/test/physical/Readme.md b/test/physical/Readme.md
@@ -13,7 +13,9 @@ physical
   |     |-- main.c
   |     |-- testsuite.c
   |     '-- testsuite.h
-  '-- Readme.md
+  |-- Readme.md
+  |-- test_common.c
+  '-- test_common.h
 ```
 
 ## Test Cases

diff --git a/test/physical/swtbahn-full/main.c b/test/physical/swtbahn-full/main.c
@@ -59,7 +59,7 @@ int main(int argc, char **argv) {
 		return 0;
 	}
 
-	//	if (bidib_start_serial("/dev/tty.usbserial-AK06U8H7", "../../swtbahn-cli/configurations/swtbahn-full/", 0)) {
+	//if (bidib_start_serial("/dev/tty.usbserial-AK06U8H7", "../../swtbahn-cli/configurations/swtbahn-full/", 0)) {
 	if (bidib_start_serial("/dev/ttyUSB0", "../../swtbahn-cli/configurations/swtbahn-full", 0)) {
 		printf("testsuite: libbidib failed to start\n");
 		return 0;
@@ -74,6 +74,7 @@ int main(int argc, char **argv) {
 	const int repetitions = atoi(argv[2]);
 	switch (atoi(argv[1])) {
 		case 1:
+			///TODO: Test why this is commented out? Think it was just debugging
 			//bidib_set_track_output_state_all(BIDIB_CS_OFF);
 			for (int i = 0; i < repetitions; i++) {
 				testsuite_case_pointParallel(result);
@@ -168,7 +169,7 @@ void printWelcome() {
 		"*   SWTbahn-testsuite  *",
 		"*                      *",
 		"************************",
-		"*    UniBa-SWT-2022    *",
+		"*    UniBa-SWT-2023    *",
 		"************************",
 		""
 	};