diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 09b113a..0334bc0 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -42,21 +42,21 @@ - + - + - + - - + + @@ -123,11 +123,21 @@ + + + + + + + + + + - - + + @@ -145,13 +155,13 @@ @@ -477,12 +487,12 @@ 1491540343823 - + - @@ -583,14 +593,6 @@ - - - - - - - - @@ -657,11 +659,15 @@ - + - - - + + + + + + + @@ -675,30 +681,34 @@ - + - - - - - - - + + + - + + + + + + + + + - - + + diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o b/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o index a80b71a..751b23d 100644 Binary files a/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o and b/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o differ diff --git a/cmake-build-debug/conf/units/all_test.units b/cmake-build-debug/conf/units/all_test.units index 38d2d4b..74937f1 100644 --- a/cmake-build-debug/conf/units/all_test.units +++ b/cmake-build-debug/conf/units/all_test.units @@ -4,8 +4,8 @@ "name": "gcc is present", "target": "./ubuntu/xenial/check_gcc_present.run", "output": "present", - "rectifier": "./ubuntu/xenial/install_gcc", - "active": true, + "rectifier": "./ubuntu/xenial/install_gcc", + "active": true, "required": true, "rectify": true }, @@ -13,8 +13,8 @@ "name": "gcc can compile", "target": "./ubuntu/xenial/check_gcc_compiles.run", "output": "can compile", - "rectifier": "", - "active": true, + "rectifier": "echo pass", + "active": true, "required": true, "rectify": false } diff --git a/cmake-build-debug/ftests b/cmake-build-debug/ftests index 81a7509..9d59e58 100755 Binary files a/cmake-build-debug/ftests and b/cmake-build-debug/ftests differ diff --git a/examplar.cpp b/examplar.cpp index 1b32ec2..8104b78 100644 --- a/examplar.cpp +++ b/examplar.cpp @@ -12,13 +12,14 @@ int main() for ( int i = 0; i < plan.tasks.size(); ++i ) { std::string current_task_name = plan.tasks[i].get_name(); - std::cout << "Found task name:\t" << current_task_name << std::endl << std::endl; + std::cout << "Found task name in \"" << configuration.get_plan_path() << "\":\t" << current_task_name << std::endl << std::endl; Unit current_unit = unitHolder.select_unit( current_task_name ); - std::cout << "Associated Unit name:\t" << current_unit.get_name() << std::endl; - std::cout << "Associated Unit target:\t" << current_unit.get_target() << std::endl; - std::cout << "Associated Unit healer:\t" << current_unit.get_rectifier() << std::endl << std::endl; + std::cout << "Associated Unit name:\t\t" << current_unit.get_name() << std::endl; + std::cout << "Associated Unit target:\t\t" << current_unit.get_target() << std::endl; + std::cout << "Associated Unit healer:\t\t" << current_unit.get_rectifier() << std::endl; + std::cout << "Associated Unit heals:\t\t" << current_unit.get_rectify() << std::endl << std::endl; }