| Index: tools/gn/function_rebase_path_unittest.cc
|
| diff --git a/tools/gn/function_rebase_path_unittest.cc b/tools/gn/function_rebase_path_unittest.cc
|
| index 8b3617565bab53e465b40d6e1dfde9dcad7148da..2c98813efd2946405caa0e390b6bcefa1dbbeff2 100644
|
| --- a/tools/gn/function_rebase_path_unittest.cc
|
| +++ b/tools/gn/function_rebase_path_unittest.cc
|
| @@ -12,13 +12,13 @@ namespace {
|
|
|
| std::string RebaseOne(Scope* scope,
|
| const char* input,
|
| - const char* from_dir,
|
| const char* to_dir,
|
| + const char* from_dir,
|
| const char* sep = NULL) {
|
| std::vector<Value> args;
|
| args.push_back(Value(NULL, input));
|
| - args.push_back(Value(NULL, from_dir));
|
| args.push_back(Value(NULL, to_dir));
|
| + args.push_back(Value(NULL, from_dir));
|
| if (sep)
|
| args.push_back(Value(NULL, sep));
|
|
|
| @@ -40,24 +40,24 @@ TEST(RebasePath, Strings) {
|
| scope->set_source_dir(SourceDir("//tools/gn/"));
|
|
|
| // Build-file relative paths.
|
| - EXPECT_EQ("../../tools/gn", RebaseOne(scope, ".", ".", "//out/Debug"));
|
| - EXPECT_EQ("../../tools/gn/", RebaseOne(scope, "./", ".", "//out/Debug"));
|
| - EXPECT_EQ("../../tools/gn/foo", RebaseOne(scope, "foo", ".", "//out/Debug"));
|
| - EXPECT_EQ("../..", RebaseOne(scope, "../..", ".", "//out/Debug"));
|
| - EXPECT_EQ("../../", RebaseOne(scope, "../../", ".", "//out/Debug"));
|
| + EXPECT_EQ("../../tools/gn", RebaseOne(scope, ".", "//out/Debug", "."));
|
| + EXPECT_EQ("../../tools/gn/", RebaseOne(scope, "./", "//out/Debug", "."));
|
| + EXPECT_EQ("../../tools/gn/foo", RebaseOne(scope, "foo", "//out/Debug", "."));
|
| + EXPECT_EQ("../..", RebaseOne(scope, "../..", "//out/Debug", "."));
|
| + EXPECT_EQ("../../", RebaseOne(scope, "../../", "//out/Debug", "."));
|
|
|
| // We don't allow going above the root source dir.
|
| - EXPECT_EQ("../..", RebaseOne(scope, "../../..", ".", "//out/Debug"));
|
| + EXPECT_EQ("../..", RebaseOne(scope, "../../..", "//out/Debug", "."));
|
|
|
| // Source-absolute input paths.
|
| EXPECT_EQ("./", RebaseOne(scope, "//", "//", "//"));
|
| EXPECT_EQ("foo", RebaseOne(scope, "//foo", "//", "//"));
|
| EXPECT_EQ("foo/", RebaseOne(scope, "//foo/", "//", "//"));
|
| - EXPECT_EQ("../../foo/bar", RebaseOne(scope, "//foo/bar", ".", "//out/Debug"));
|
| - EXPECT_EQ("./", RebaseOne(scope, "//foo/", "//", "//foo/"));
|
| + EXPECT_EQ("../../foo/bar", RebaseOne(scope, "//foo/bar", "//out/Debug", "."));
|
| + EXPECT_EQ("./", RebaseOne(scope, "//foo/", "//foo/", "//"));
|
| // Thie one is technically correct but could be simplified to "." if
|
| // necessary.
|
| - EXPECT_EQ("../foo", RebaseOne(scope, "//foo", "//", "//foo"));
|
| + EXPECT_EQ("../foo", RebaseOne(scope, "//foo", "//foo", "//"));
|
|
|
| // Test slash conversion.
|
| #if defined(OS_WIN)
|
| @@ -77,11 +77,11 @@ TEST(RebasePath, Strings) {
|
| // Test system path output.
|
| #if defined(OS_WIN)
|
| setup.build_settings()->SetRootPath(base::FilePath(L"C:\\source"));
|
| - EXPECT_EQ("C:\\source", RebaseOne(scope, ".", "//", ""));
|
| - EXPECT_EQ("C:\\source\\", RebaseOne(scope, "//", "//", ""));
|
| - EXPECT_EQ("C:\\source\\foo", RebaseOne(scope, "foo", "//", ""));
|
| - EXPECT_EQ("C:\\source\\foo\\", RebaseOne(scope, "foo/", "//", ""));
|
| - EXPECT_EQ("C:\\source\\tools\\gn\\foo", RebaseOne(scope, "foo", ".", ""));
|
| + EXPECT_EQ("C:\\source", RebaseOne(scope, ".", "", "//"));
|
| + EXPECT_EQ("C:\\source\\", RebaseOne(scope, "//", "", "//"));
|
| + EXPECT_EQ("C:\\source\\foo", RebaseOne(scope, "foo", "", "//"));
|
| + EXPECT_EQ("C:\\source\\foo\\", RebaseOne(scope, "foo/", "", "//"));
|
| + EXPECT_EQ("C:\\source\\tools\\gn\\foo", RebaseOne(scope, "foo", "", "."));
|
| #else
|
| setup.build_settings()->SetRootPath(base::FilePath("/source"));
|
| EXPECT_EQ("/source", RebaseOne(scope, ".", "//", ""));
|
|
|