aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSen Jiang <senj@google.com>2018-03-02 11:54:30 -0800
committerSen Jiang <senj@google.com>2018-03-02 11:54:30 -0800
commit5442cfeeec037fead0a432d15d3381d6dd4ce8ba (patch)
treed5b0f22547c3c7068a3c18d849ac14bb81e34990
parent678a68f298a4e2a0435ea612cbbd120bf5f7f6be (diff)
downloadupdate_engine-5442cfeeec037fead0a432d15d3381d6dd4ce8ba.tar.gz
Remove the PATH workaround for Android unittest.
We are not running bsdiff binary anymore so this is no longer needed. Test: update_engine_unittests Change-Id: I7e0f7d77b2f312cb6f40b8abc9154df39442ac7c
-rw-r--r--testrunner.cc13
1 files changed, 0 insertions, 13 deletions
diff --git a/testrunner.cc b/testrunner.cc
index 934ea916..635e1205 100644
--- a/testrunner.cc
+++ b/testrunner.cc
@@ -16,18 +16,14 @@
// based on pam_google_testrunner.cc
-#include <string>
-
#include <xz.h>
#include <base/at_exit.h>
#include <base/command_line.h>
-#include <base/environment.h>
#include <brillo/test_helpers.h>
#include <gtest/gtest.h>
#include "update_engine/common/terminator.h"
-#include "update_engine/common/test_utils.h"
#include "update_engine/payload_generator/xz.h"
int main(int argc, char **argv) {
@@ -44,15 +40,6 @@ int main(int argc, char **argv) {
// the default exit status of 1. Corresponding reverts are necessary in
// terminator_unittest.cc.
chromeos_update_engine::Terminator::Init(2);
- // In Android bsdiff is located in update_engine_unittests, add it to PATH.
-#ifdef __ANDROID__
- std::unique_ptr<base::Environment> env(base::Environment::Create());
- std::string path_env;
- CHECK(env->GetVar("PATH", &path_env));
- path_env +=
- ":" + chromeos_update_engine::test_utils::GetBuildArtifactsPath().value();
- CHECK(env->SetVar("PATH", path_env));
-#endif
LOG(INFO) << "parsing command line arguments";
base::CommandLine::Init(argc, argv);
LOG(INFO) << "initializing gtest";