Merge 3cbf42a into 77aa8e4

mavlink · Aug 14, 2018 · df0ed85 · df0ed85
2 parents 77aa8e4 + 3cbf42a
commit df0ed85
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/plugins/mission/mission_import_qgc_test.cpp b/plugins/mission/mission_import_qgc_test.cpp
@@ -11,15 +11,10 @@
 #include "global_include.h"
 #include "log.h"
 
-// To locate QGroundControl plan file during Unit test.
-#ifdef WINDOWS
-const std::string SLASH = "\\";
-#else
-const std::string SLASH = "/";
-#endif
-
 using namespace dronecode_sdk;
 
+static const std::string QGC_SAMPLE_PLAN = "plugins/mission/qgroundcontrol_sample.plan";
+
 struct QGCMissionItem {
     MAV_CMD command;
     std::vector<double> params;
@@ -79,11 +74,6 @@ TEST(QGCMissionImport, ValidateQGCMissonItems)
     }
     mission_items_local.push_back(new_mission_item);
 
-    // Locate path of QGC Sample plan
-    std::string self_file_path = __FILE__;
-    std::string self_dir_path = self_file_path.substr(0, self_file_path.rfind(SLASH));
-    const std::string QGC_SAMPLE_PLAN = self_dir_path + SLASH + "qgroundcontrol_sample.plan";
-
     // Import Mission items from QGC plan
     Mission::mission_items_t mission_items_imported;
     Mission::Result import_result =