fix misprints

ref:53f4094a2f5cdb22d7c226dc227128c1e3ae82d0
catboost · Sep 24, 2019 · 5bf6747 · 5bf6747
1 parent 13fcf34
commit 5bf6747
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/build/plugins/gobuild.py b/build/plugins/gobuild.py
@@ -184,7 +184,9 @@ def on_go_process_srcs(unit):
     cgo_cflags = []
     if len(c_files) + len(cxx_files) + len(s_files) + len(cgo_files) > 0:
         if is_test_module:
-            cgo_cflags.append(os.path.join('-I${ARCADIA_ROOT}', unit.get('GO_TEST_FOR_DIR')[3:]))
+            go_test_for_dir = unit.get('GO_TEST_FOR_DIR')
+            if go_test_for_dir and go_test_for_dir.startswith('$S/'):
+                cgo_cflags.append(os.path.join('-I${ARCADIA_ROOT}', go_test_for_dir[3:]))
         cgo_cflags.append('-I$CURDIR')
         unit.oncgo_cflags(cgo_cflags)
         cgo_cflags = get_appended_values(unit, 'CGO_CFLAGS_VALUE')

diff --git a/build/scripts/go_tool.py b/build/scripts/go_tool.py
@@ -113,7 +113,7 @@ def vet_report_output_name(path):
 
 
 def get_source_path(args):
-    return args.test_import_path or args.output_root[len(args.build_root):]
+    return args.test_import_path or args.module_path
 
 
 def gen_vet_info(args):
@@ -450,7 +450,7 @@ def do_link_test(args):
     assert args.srcs or args.xtest_srcs
     assert args.test_miner is not None
 
-    test_module_path = args.test_import_path or args.module_path
+    test_module_path = get_source_path(args)
     test_import_path, _ = get_import_path(test_module_path)
 
     test_lib_args = None