diff options
| author | klarlund <klarlund@gmail.com> | 2008-06-30 17:10:17 +0000 |
|---|---|---|
| committer | klarlund <klarlund@gmail.com> | 2008-06-30 17:10:17 +0000 |
| commit | 3fb74b6ecc2096fe6037dd6b20b0d4f763d27bf5 (patch) | |
| tree | e750abfd25ce70e5b962a4350bbd8c8e2943d304 /include_server/parse_command_test.py | |
| parent | 4f5df64d1e81a4748cd77804c1954a6236b9b371 (diff) | |
| download | distcc-git-3fb74b6ecc2096fe6037dd6b20b0d4f763d27bf5.tar.gz | |
Revert r393.
This change is mostly reverted -- some variable renamings are not
changed back. A subsequent CL proposes a less arbitrary way to solve
the problem of -I<some_dir_in_default_place_where_compiler_looks>,
which involves sending no system default header files at all.
Tests: make pump-check and make include-server-check
Diffstat (limited to 'include_server/parse_command_test.py')
| -rwxr-xr-x | include_server/parse_command_test.py | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/include_server/parse_command_test.py b/include_server/parse_command_test.py index 4d8ddfb..a982775 100755 --- a/include_server/parse_command_test.py +++ b/include_server/parse_command_test.py @@ -116,8 +116,7 @@ class ParseCommandUnitTest(unittest.TestCase): def test_ParseCommandArgs(self): - (quote_dirs, angle_dirs, include_files, filepath, _incl_clos_f, _d_opts, - send_systemdirs) = ( + quote_dirs, angle_dirs, include_files, filepath, _incl_clos_f, _d_opts = ( parse_command.ParseCommandArgs( parse_command.ParseCommandLine( self.mock_compiler + " -isystem system -Imice -iquote/and -I/men a.c " @@ -127,8 +126,6 @@ class ParseCommandUnitTest(unittest.TestCase): os.getcwd(), self.includepath_map, self.directory_map, - self.realpath_map, - self.systemdir_prefix_cache, self.compiler_defaults)) self.assertEqual( @@ -149,12 +146,9 @@ class ParseCommandUnitTest(unittest.TestCase): os.getcwd(), self.includepath_map, self.directory_map, - self.realpath_map, - self.systemdir_prefix_cache, self.compiler_defaults) - (quote_dirs, angle_dirs, include_files, filepath, _incl_cls_file, _d_opts, - send_systemdirs) = ( + quote_dirs, angle_dirs, include_files, filepath, _incl_cls_file, _d_opts = ( parse_command.ParseCommandArgs(parse_command.ParseCommandLine( "/usr/crosstool/v8/gcc-4.1.0-glibc-2.2.2/blah/gcc" + " -fno-exceptions -funsigned-char -D__STDC_FORMAT_MACROS -g0" @@ -168,8 +162,6 @@ class ParseCommandUnitTest(unittest.TestCase): os.getcwd(), self.includepath_map, self.directory_map, - self.realpath_map, - self.systemdir_prefix_cache, self.compiler_defaults)) self.assertEqual( (self._RetrieveDirectoriesExceptSys(quote_dirs), @@ -191,14 +183,12 @@ class ParseCommandUnitTest(unittest.TestCase): t = time.time() for unused_i in range(100): (quote_dirs, angle_dirs, include_files, filepath, - _include_closure_file, _d_opts, send_systemdirs) = ( + _include_closure_file, _d_opts) = ( parse_command.ParseCommandArgs( parse_command.ParseCommandLine(whopper), os.getcwd(), self.includepath_map, self.directory_map, - self.realpath_map, - self.systemdir_prefix_cache, self.compiler_defaults)) print "100 iterations of ParseCommandArgs takes %3.1fs" % (time.time() - t) return True |