Always use an absolute path when munging sys.path

It's safer in general and fixes a bug (see bug for details).

Some individually runnable files failed before this change and still fail with the same message after it:

   grit/format/rc_header_unittest.py
   grit/node/io_unittest.py
   grit/node/message_unittest.py
   grit/node/structure_unittest.py
   grit/pseudo_unittest.py
   grit/util_unittest.py

BUG=138752
TEST=Grit unit and run each affected file individually without arguments

Review URL: https://chromiumcodereview.appspot.com/10843008

git-svn-id: http://grit-i18n.googlecode.com/svn/trunk@65 7262f16d-afe8-6277-6482-052fa10e57b1

51 files changed, 55 insertions, 55 deletions

diff --git a/grit/clique_unittest.py b/grit/clique_unittest.py
index f025134..08d4ec2 100644
--- a/grit/clique_unittest.py
+++ b/grit/clique_unittest.py
@@ -8,7 +8,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '..'))
 
 import re
 import StringIO
diff --git a/grit/format/android_xml_unittest.py b/grit/format/android_xml_unittest.py
index 28d9146..241322a 100644
--- a/grit/format/android_xml_unittest.py
+++ b/grit/format/android_xml_unittest.py
@@ -11,7 +11,7 @@ import sys
 import unittest
 
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 from grit import grd_reader
 from grit import util
diff --git a/grit/format/c_format_unittest.py b/grit/format/c_format_unittest.py
index ecf7353..344417d 100644
--- a/grit/format/c_format_unittest.py
+++ b/grit/format/c_format_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import unittest
 import StringIO
diff --git a/grit/format/data_pack.py b/grit/format/data_pack.py
index 017f797..4cc438c 100755
--- a/grit/format/data_pack.py
+++ b/grit/format/data_pack.py
@@ -11,8 +11,9 @@ import exceptions
 import os
 import struct
 import sys
+if __name__ == '__main__':
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
-sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..'))
 from grit import util
 from grit.format import interface
 from grit.node import include
@@ -158,7 +159,7 @@ class DataPack(interface.ItemFormatter):
     DataPack.WriteDataPack(resources, output_file, encoding)
 
 def main():
-  if len(sys.argv):
+  if len(sys.argv) > 1:
     # When an argument is given, read and explode the file to text
     # format, for easier diffing.
     data = DataPack.ReadDataPack(sys.argv[1])
diff --git a/grit/format/data_pack_unittest.py b/grit/format/data_pack_unittest.py
index 4faf5f7..8fcf9e5 100644
--- a/grit/format/data_pack_unittest.py
+++ b/grit/format/data_pack_unittest.py
@@ -5,14 +5,17 @@
 
 '''Unit tests for grit.format.data_pack'''
 
+
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
+
 import unittest
 
 from grit.format import data_pack
 
+
 class FormatDataPackUnittest(unittest.TestCase):
   def testWriteDataPack(self):
     expected = (
diff --git a/grit/format/js_map_format_unittest.py b/grit/format/js_map_format_unittest.py
index c5322b1..28c70bd 100644
--- a/grit/format/js_map_format_unittest.py
+++ b/grit/format/js_map_format_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import unittest
 import StringIO
diff --git a/grit/format/policy_templates/policy_template_generator_unittest.py b/grit/format/policy_templates/policy_template_generator_unittest.py
index f2def20..e268d75 100644
--- a/grit/format/policy_templates/policy_template_generator_unittest.py
+++ b/grit/format/policy_templates/policy_template_generator_unittest.py
@@ -7,7 +7,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../../..'))
 
 import unittest
 
diff --git a/grit/format/policy_templates/writers/adm_writer_unittest.py b/grit/format/policy_templates/writers/adm_writer_unittest.py
index c0c855b..03ab24a 100644
--- a/grit/format/policy_templates/writers/adm_writer_unittest.py
+++ b/grit/format/policy_templates/writers/adm_writer_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../../../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../../../..'))
 
 import unittest
 
diff --git a/grit/format/policy_templates/writers/adml_writer_unittest.py b/grit/format/policy_templates/writers/adml_writer_unittest.py
index b6ea01f..a841b9b 100644
--- a/grit/format/policy_templates/writers/adml_writer_unittest.py
+++ b/grit/format/policy_templates/writers/adml_writer_unittest.py
@@ -11,7 +11,7 @@ import os
 import sys
 import unittest
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../../../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../../../..'))
 
 
 from grit.format.policy_templates.writers import adml_writer
diff --git a/grit/format/policy_templates/writers/admx_writer_unittest.py b/grit/format/policy_templates/writers/admx_writer_unittest.py
index 5dab63d..f538a44 100644
--- a/grit/format/policy_templates/writers/admx_writer_unittest.py
+++ b/grit/format/policy_templates/writers/admx_writer_unittest.py
@@ -11,7 +11,7 @@ import os
 import sys
 import unittest
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../../../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../../../..'))
 
 
 from grit.format.policy_templates.writers import admx_writer
diff --git a/grit/format/policy_templates/writers/doc_writer_unittest.py b/grit/format/policy_templates/writers/doc_writer_unittest.py
index 8e6afb8..1c23a50 100644
--- a/grit/format/policy_templates/writers/doc_writer_unittest.py
+++ b/grit/format/policy_templates/writers/doc_writer_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../../../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../../../..'))
 
 import unittest
 from xml.dom import minidom
diff --git a/grit/format/policy_templates/writers/json_writer_unittest.py b/grit/format/policy_templates/writers/json_writer_unittest.py
index 3321b14..241f1ae 100644
--- a/grit/format/policy_templates/writers/json_writer_unittest.py
+++ b/grit/format/policy_templates/writers/json_writer_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../../../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../../../..'))
 
 import unittest
 
diff --git a/grit/format/policy_templates/writers/plist_strings_writer_unittest.py b/grit/format/policy_templates/writers/plist_strings_writer_unittest.py
index 3d5f200..8c08da7 100644
--- a/grit/format/policy_templates/writers/plist_strings_writer_unittest.py
+++ b/grit/format/policy_templates/writers/plist_strings_writer_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../../../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../../../..'))
 
 import unittest
 
diff --git a/grit/format/policy_templates/writers/plist_writer_unittest.py b/grit/format/policy_templates/writers/plist_writer_unittest.py
index 4b70614..159e983 100644
--- a/grit/format/policy_templates/writers/plist_writer_unittest.py
+++ b/grit/format/policy_templates/writers/plist_writer_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../../../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../../../..'))
 
 import unittest
 
diff --git a/grit/format/policy_templates/writers/reg_writer_unittest.py b/grit/format/policy_templates/writers/reg_writer_unittest.py
index c41b660..9274bfa 100644
--- a/grit/format/policy_templates/writers/reg_writer_unittest.py
+++ b/grit/format/policy_templates/writers/reg_writer_unittest.py
@@ -10,7 +10,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../../../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../../../..'))
 
 import unittest
 
diff --git a/grit/format/policy_templates/writers/template_writer_unittest.py b/grit/format/policy_templates/writers/template_writer_unittest.py
index 052f4c5..dad6d7c 100644
--- a/grit/format/policy_templates/writers/template_writer_unittest.py
+++ b/grit/format/policy_templates/writers/template_writer_unittest.py
@@ -8,7 +8,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../../../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../../../..'))
 
 import unittest
 
diff --git a/grit/format/policy_templates/writers/writer_unittest_common.py b/grit/format/policy_templates/writers/writer_unittest_common.py
index 1e9fb3c..f151c51 100644
--- a/grit/format/policy_templates/writers/writer_unittest_common.py
+++ b/grit/format/policy_templates/writers/writer_unittest_common.py
@@ -7,10 +7,6 @@
 
 
 import os
-import sys
-if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../../../..'))
-
 import tempfile
 import unittest
 import StringIO
diff --git a/grit/format/rc_header_unittest.py b/grit/format/rc_header_unittest.py
index 414f77a..125a883 100644
--- a/grit/format/rc_header_unittest.py
+++ b/grit/format/rc_header_unittest.py
@@ -11,7 +11,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import StringIO
 import unittest
diff --git a/grit/format/rc_unittest.py b/grit/format/rc_unittest.py
index 06c815a..a786278 100644
--- a/grit/format/rc_unittest.py
+++ b/grit/format/rc_unittest.py
@@ -9,7 +9,7 @@ import os
 import re
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import tempfile
 import unittest
diff --git a/grit/gather/admin_template_unittest.py b/grit/gather/admin_template_unittest.py
index 7f91837..c1e8571 100644
--- a/grit/gather/admin_template_unittest.py
+++ b/grit/gather/admin_template_unittest.py
@@ -8,7 +8,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import StringIO
 import tempfile
diff --git a/grit/gather/chrome_html_unittest.py b/grit/gather/chrome_html_unittest.py
index 0b07f7c..aeb879d 100644
--- a/grit/gather/chrome_html_unittest.py
+++ b/grit/gather/chrome_html_unittest.py
@@ -10,7 +10,7 @@ import os
 import re
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import unittest
 
diff --git a/grit/gather/igoogle_strings_unittest.py b/grit/gather/igoogle_strings_unittest.py
index 6fa87ac..62ad112 100644
--- a/grit/gather/igoogle_strings_unittest.py
+++ b/grit/gather/igoogle_strings_unittest.py
@@ -8,7 +8,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import unittest
 import StringIO
diff --git a/grit/gather/muppet_strings_unittest.py b/grit/gather/muppet_strings_unittest.py
index ca13aac..1d339fe 100644
--- a/grit/gather/muppet_strings_unittest.py
+++ b/grit/gather/muppet_strings_unittest.py
@@ -8,7 +8,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import unittest
 import StringIO
diff --git a/grit/gather/policy_json_unittest.py b/grit/gather/policy_json_unittest.py
index c28a009..613a50d 100644
--- a/grit/gather/policy_json_unittest.py
+++ b/grit/gather/policy_json_unittest.py
@@ -9,7 +9,7 @@ import os
 import re
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import unittest
 import StringIO
diff --git a/grit/gather/rc_unittest.py b/grit/gather/rc_unittest.py
index f55ff39..3597b74 100644
--- a/grit/gather/rc_unittest.py
+++ b/grit/gather/rc_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import unittest
 import StringIO
diff --git a/grit/gather/tr_html_unittest.py b/grit/gather/tr_html_unittest.py
index 59f90b7..86c7299 100644
--- a/grit/gather/tr_html_unittest.py
+++ b/grit/gather/tr_html_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import types
 import unittest
diff --git a/grit/gather/txt_unittest.py b/grit/gather/txt_unittest.py
index 9ee6307..98d75c9 100644
--- a/grit/gather/txt_unittest.py
+++ b/grit/gather/txt_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 
 import StringIO
diff --git a/grit/grd_reader_unittest.py b/grit/grd_reader_unittest.py
index a4331ac..4a2a745 100644
--- a/grit/grd_reader_unittest.py
+++ b/grit/grd_reader_unittest.py
@@ -8,7 +8,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '..'))
 
 import unittest
 import StringIO
diff --git a/grit/grit_runner.py b/grit/grit_runner.py
index 13927e7..64e0dd0 100644
--- a/grit/grit_runner.py
+++ b/grit/grit_runner.py
@@ -10,7 +10,7 @@ GRIT tools.
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '..'))
 
 import getopt
 
diff --git a/grit/grit_runner_unittest.py b/grit/grit_runner_unittest.py
index a632aa7..29649b9 100644
--- a/grit/grit_runner_unittest.py
+++ b/grit/grit_runner_unittest.py
@@ -8,7 +8,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '..'))
 
 import unittest
 import StringIO
diff --git a/grit/lazy_re_unittest.py b/grit/lazy_re_unittest.py
index e0272c6..659bfb6 100644
--- a/grit/lazy_re_unittest.py
+++ b/grit/lazy_re_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '..'))
 
 import re
 import unittest
diff --git a/grit/node/base_unittest.py b/grit/node/base_unittest.py
index ab4af93..37f34a3 100644
--- a/grit/node/base_unittest.py
+++ b/grit/node/base_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import StringIO
 import unittest
diff --git a/grit/node/custom/filename_unittest.py b/grit/node/custom/filename_unittest.py
index e258e9c..968cace 100644
--- a/grit/node/custom/filename_unittest.py
+++ b/grit/node/custom/filename_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../../..'))
 
 import unittest
 from grit.node.custom import filename
diff --git a/grit/node/io_unittest.py b/grit/node/io_unittest.py
index ec52ec9..8ebf896 100644
--- a/grit/node/io_unittest.py
+++ b/grit/node/io_unittest.py
@@ -8,7 +8,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import os
 import StringIO
diff --git a/grit/node/message_unittest.py b/grit/node/message_unittest.py
index b17da4a..a11ee18 100644
--- a/grit/node/message_unittest.py
+++ b/grit/node/message_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import unittest
 import StringIO
diff --git a/grit/node/misc_unittest.py b/grit/node/misc_unittest.py
index 660673e..3a0d63d 100644
--- a/grit/node/misc_unittest.py
+++ b/grit/node/misc_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import unittest
 import StringIO
diff --git a/grit/node/structure_unittest.py b/grit/node/structure_unittest.py
index 8fe4db3..361ecce 100644
--- a/grit/node/structure_unittest.py
+++ b/grit/node/structure_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import unittest
 import StringIO
diff --git a/grit/pseudo_unittest.py b/grit/pseudo_unittest.py
index fb88c36..ef9b179 100644
--- a/grit/pseudo_unittest.py
+++ b/grit/pseudo_unittest.py
@@ -8,7 +8,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '..'))
 
 import unittest
 
diff --git a/grit/shortcuts_unittests.py b/grit/shortcuts_unittests.py
index 57f3d42..f9e0934 100644
--- a/grit/shortcuts_unittests.py
+++ b/grit/shortcuts_unittests.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '..'))
 
 import unittest
 import StringIO
diff --git a/grit/tclib_unittest.py b/grit/tclib_unittest.py
index e60a06b..3dc4a7c 100644
--- a/grit/tclib_unittest.py
+++ b/grit/tclib_unittest.py
@@ -9,7 +9,7 @@
 import sys
 import os.path
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '..'))
 
 import types
 import unittest
diff --git a/grit/test_suite_all.py b/grit/test_suite_all.py
index e0e51c3..9092b80 100644
--- a/grit/test_suite_all.py
+++ b/grit/test_suite_all.py
@@ -8,7 +8,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '..'))
 
 import unittest
 
diff --git a/grit/tool/android2grd_unittest.py b/grit/tool/android2grd_unittest.py
index a6d1064..afd8874 100644
--- a/grit/tool/android2grd_unittest.py
+++ b/grit/tool/android2grd_unittest.py
@@ -8,7 +8,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import unittest
 import xml.dom.minidom
diff --git a/grit/tool/build_unittest.py b/grit/tool/build_unittest.py
index 0d447e3..238f086 100644
--- a/grit/tool/build_unittest.py
+++ b/grit/tool/build_unittest.py
@@ -10,7 +10,7 @@ import os
 import sys
 import tempfile
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import unittest
 
diff --git a/grit/tool/buildinfo_unittest.py b/grit/tool/buildinfo_unittest.py
index a48dcb3..20bcd73 100644
--- a/grit/tool/buildinfo_unittest.py
+++ b/grit/tool/buildinfo_unittest.py
@@ -13,7 +13,7 @@ import unittest
 
 # This is needed to find some of the imports below.
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 # pylint: disable-msg=C6204
 from grit.tool import buildinfo
diff --git a/grit/tool/postprocess_unittest.py b/grit/tool/postprocess_unittest.py
index aface96..c0192f3 100644
--- a/grit/tool/postprocess_unittest.py
+++ b/grit/tool/postprocess_unittest.py
@@ -12,7 +12,7 @@ import os
 import re
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import unittest
 
diff --git a/grit/tool/preprocess_unittest.py b/grit/tool/preprocess_unittest.py
index fc4a029..8987ea4 100644
--- a/grit/tool/preprocess_unittest.py
+++ b/grit/tool/preprocess_unittest.py
@@ -11,7 +11,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import unittest
 
diff --git a/grit/tool/rc2grd_unittest.py b/grit/tool/rc2grd_unittest.py
index 05c3e07..064256c 100644
--- a/grit/tool/rc2grd_unittest.py
+++ b/grit/tool/rc2grd_unittest.py
@@ -8,7 +8,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import re
 import StringIO
diff --git a/grit/tool/transl2tc_unittest.py b/grit/tool/transl2tc_unittest.py
index f63c2b7..c1f2621 100644
--- a/grit/tool/transl2tc_unittest.py
+++ b/grit/tool/transl2tc_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import StringIO
 import unittest
diff --git a/grit/tool/xmb_unittest.py b/grit/tool/xmb_unittest.py
index 128f663..4ac964b 100644
--- a/grit/tool/xmb_unittest.py
+++ b/grit/tool/xmb_unittest.py
@@ -8,7 +8,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '../..'))
 
 import unittest
 import StringIO
diff --git a/grit/util_unittest.py b/grit/util_unittest.py
index 657fe81..920a7e2 100644
--- a/grit/util_unittest.py
+++ b/grit/util_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '..'))
 
 import unittest
 
diff --git a/grit/xtb_reader_unittest.py b/grit/xtb_reader_unittest.py
index b8c8b0b..41134a2 100644
--- a/grit/xtb_reader_unittest.py
+++ b/grit/xtb_reader_unittest.py
@@ -9,7 +9,7 @@
 import os
 import sys
 if __name__ == '__main__':
-  sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..'))
+  sys.path[0] = os.path.abspath(os.path.join(sys.path[0], '..'))
 
 import StringIO
 import unittest