Merge pull request #214 from afbjorklund/distcheck

Fix broken "make distcheck"

4 files changed, 7 insertions, 7 deletions

diff --git a/find_c_extension.sh b/find_c_extension.sh
index ab0f8f7..3172a0a 100755
--- a/find_c_extension.sh
+++ b/find_c_extension.sh
@@ -19,7 +19,7 @@ builddir="$1"
 # (Side note: there is intense internal debate about whether the
 # '[sd][ol]' hack is "so ugly I can't stand it" or "kinda cute".)
 so_files=`ls $builddir/_include_server/lib.*/include_server/\
-distcc_pump_c_extensions.[sd][ol]*`
+distcc_pump_c_extensions*.[sd][ol]*`
 if [ -z "$so_files" ]; then
   echo \
     '__________Could not find shared libraries for distcc-pump' 1>&2
diff --git a/include_server/include_analyzer_test.py b/include_server/include_analyzer_test.py
index 728eca5..0a6d1d3 100755
--- a/include_server/include_analyzer_test.py
+++ b/include_server/include_analyzer_test.py
@@ -247,7 +247,7 @@ class IncludeAnalyzerTest(unittest.TestCase):
       glob.glob = Mock_GlobGlob
 
       real_os_stat = os.stat
-      def Mock_OsStat(f):
+      def Mock_OsStat(f, dir_fd=None, follow_symlinks=True):
         # Return the same as initial value in two cases below.
         if f in ["seven", "nine"]: raise OSError
         if f == 'ate':
@@ -282,7 +282,7 @@ class IncludeAnalyzerTest(unittest.TestCase):
       self.assertEqual(self.include_analyzer.generation, 1)
       CheckGeneration(files_and_links, 1)
 
-      def New_Mock_OsStat(f):
+      def New_Mock_OsStat(f, dir_fd=None, follow_symlinks=True):
         if f in ["seven", "nine"]: raise OSError
         if f == 'ate':
           obj = lambda: None
@@ -322,7 +322,7 @@ class IncludeAnalyzerTest(unittest.TestCase):
         return real_glob_glob(f)
       glob.glob = New_Mock_GlobGlob
 
-      def New_New_Mock_OsStat(f):
+      def New_New_Mock_OsStat(f, dir_fd=None, follow_symlinks=True):
         if f in ["seven", "nine"]: raise OSError
         if f == 'ate':
           obj = lambda: None
diff --git a/include_server/parse_command.py b/include_server/parse_command.py
index 050d00f..cd02d01 100755
--- a/include_server/parse_command.py
+++ b/include_server/parse_command.py
@@ -114,7 +114,7 @@ CPP_OPTIONS_MAYBE_TWO_WORDS = {
   '-isystem':       lambda ps, arg: ps.before_system_dirs.append(arg),
   '-iquote':        lambda ps, arg: ps.quote_dirs.append(arg),
 }
-CPP_OPTIONS_MAYBE_TWO_WORDS_FIRST_LETTERS = ('M', 'i', '-', 'a')
+CPP_OPTIONS_MAYBE_TWO_WORDS_FIRST_LETTERS = ('M', 'i', '-', 'a', 't')
 # A "compile-time" check to make sure the first-letter list is up-to-date
 for key in CPP_OPTIONS_MAYBE_TWO_WORDS.keys():
   assert key[1] in CPP_OPTIONS_MAYBE_TWO_WORDS_FIRST_LETTERS
diff --git a/test/testdistcc.py b/test/testdistcc.py
index 38647cd..a116f54 100755
--- a/test/testdistcc.py
+++ b/test/testdistcc.py
@@ -313,7 +313,7 @@ as soon as that happens we can go ahead and start the client."""
         """Return command to start the daemon"""
         return (self.distccd() +
                 "--verbose --lifetime=%d --daemon --log-file %s "
-                "--pid-file %s --port %d --allow 127.0.0.1 --listen 127.0.0.1"
+                "--pid-file %s --port %d --allow 127.0.0.1"
                 % (self.daemon_lifetime(),
                    _ShellSafe(self.daemon_logfile),
                    _ShellSafe(self.daemon_pidfile),
@@ -964,8 +964,8 @@ int main(void) {
 class BackslashInMacro_Case(ComputedInclude_Case):
     def source(self):
         return """
+#include <stdio.h>
 #if FALSE
-  #include <stdio.h>
   #define HEADER MAKE_HEADER(testhdr)
   #define MAKE_HEADER(header_name) STRINGIZE(foobar\)
   #define STRINGIZE(x) STRINGIZE2(x)