Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mission: fix mission plan path for macOS #488

Merged
merged 1 commit into from
Aug 16, 2018
Merged

mission: fix mission plan path for macOS #488

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions plugins/mission/mission_import_qgc_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 =
Expand Down