Remove default value checking in GN, adds getenv function, reorders parameters to rebase_path.

This allows us to have the default value vary according to other parameters. This is what we need in many cases, so having this restriction just made things more complicated.

The getenv function will allow us to replace some Python scripts with a fast native function call.

The use of rebase path is pretty annoying. 99% of all callers want the "from" directory to be the current one. I reordered the parameters to move the from directory later so we can have a default value for it.

This will require a patch to change all current callers of rebase_path when new deps are pulled.

BUG=342937
R=viettrungluu@chromium.org

Review URL: https://codereview.chromium.org/161783002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251821 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 22 insertions, 36 deletions

diff --git a/tools/gn/function_rebase_path_unittest.cc b/tools/gn/function_rebase_path_unittest.cc
index 8b36175..fd0c6be 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,18 +77,18 @@ 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, ".", "//", ""));
-  EXPECT_EQ("/source/", RebaseOne(scope, "//", "//", ""));
-  EXPECT_EQ("/source/foo", RebaseOne(scope, "foo", "//", ""));
-  EXPECT_EQ("/source/foo/", RebaseOne(scope, "foo/", "//", ""));
-  EXPECT_EQ("/source/tools/gn/foo", RebaseOne(scope, "foo", ".", ""));
+  EXPECT_EQ("/source", RebaseOne(scope, ".", "", "//"));
+  EXPECT_EQ("/source/", RebaseOne(scope, "//", "", "//"));
+  EXPECT_EQ("/source/foo", RebaseOne(scope, "foo", "", "//"));
+  EXPECT_EQ("/source/foo/", RebaseOne(scope, "foo/", "", "//"));
+  EXPECT_EQ("/source/tools/gn/foo", RebaseOne(scope, "foo", "", "."));
 #endif
 }
 
@@ -102,8 +102,8 @@ TEST(RebasePath, List) {
   args.push_back(Value(NULL, Value::LIST));
   args[0].list_value().push_back(Value(NULL, "foo.txt"));
   args[0].list_value().push_back(Value(NULL, "bar.txt"));
-  args.push_back(Value(NULL, "."));
   args.push_back(Value(NULL, "//out/Debug/"));
+  args.push_back(Value(NULL, "."));
 
   Err err;
   FunctionCallNode function;
@@ -127,18 +127,4 @@ TEST(RebasePath, Errors) {
   FunctionCallNode function;
   Value ret = functions::RunRebasePath(setup.scope(), &function, args, &err);
   EXPECT_TRUE(err.has_error());
-
-  // One arg int input.
-  args.push_back(Value(NULL, static_cast<int64>(5)));
-  err = Err();
-  ret = functions::RunRebasePath(setup.scope(), &function, args, &err);
-  EXPECT_TRUE(err.has_error());
-
-  // Two arg string input.
-  args.clear();
-  args.push_back(Value(NULL, "hello"));
-  args.push_back(Value(NULL, "world"));
-  err = Err();
-  ret = functions::RunRebasePath(setup.scope(), &function, args, &err);
-  EXPECT_TRUE(err.has_error());
 }