Update pymake snapshot to r300.
authorKyle Huey <khuey@kylehuey.com>
Mon, 31 Oct 2011 13:16:21 -0400
changeset 79465 d13cb5295a3797940596105770e044df725fa7d1
parent 79464 8c555a3826e7ed38604c5aacb74e6630e2416c05
child 79466 67d1049b0bf9d6e67370d8767695df5569e0d67a
child 80130 e9e6741defd440bc7363be597b5946c0d36e6796
push id21405
push userkhuey@mozilla.com
push dateMon, 31 Oct 2011 18:15:41 +0000
treeherdermozilla-central@67d1049b0bf9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone10.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Update pymake snapshot to r300.
build/pymake/.hg_archival.txt
build/pymake/pymake/data.py
build/pymake/pymake/functions.py
build/pymake/tests/dotslash-dir.mk
build/pymake/tests/dotslash-parse.mk
build/pymake/tests/dotslash-phony.mk
build/pymake/tests/info.mk
build/pymake/tests/parentheses.mk
build/pymake/tests/runtests.py
deleted file mode 100644
--- a/build/pymake/.hg_archival.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-repo: f5ab154deef2ffa97f1b2139589ae4a1962090a4
-node: 84ced2ab192d4b2ad796110d4c62fabc9ac6968d
-branch: default
-latesttag: null
-latesttagdistance: 257
--- a/build/pymake/pymake/data.py
+++ b/build/pymake/pymake/data.py
@@ -41,17 +41,18 @@ def getmtime(path):
     try:
         s = os.stat(path)
         return s.st_mtime
     except OSError:
         return None
 
 def stripdotslash(s):
     if s.startswith('./'):
-        return s[2:]
+        st = s[2:]
+        return st if st != '' else '.'
     return s
 
 def stripdotslashes(sl):
     for s in sl:
         yield stripdotslash(s)
 
 def getindent(stack):
     return ''.ljust(len(stack) - 1)
--- a/build/pymake/pymake/functions.py
+++ b/build/pymake/pymake/functions.py
@@ -649,17 +649,17 @@ class InfoFunction(Function):
     name = 'info'
     minargs = 1
     maxargs = 1
 
     __slots__ = Function.__slots__
 
     def resolve(self, makefile, variables, fd, setting):
         v = self._arguments[0].resolvestr(makefile, variables, setting)
-        log.info(v)
+        print v
 
 functionmap = {
     'subst': SubstFunction,
     'patsubst': PatSubstFunction,
     'strip': StripFunction,
     'findstring': FindstringFunction,
     'filter': FilterFunction,
     'filter-out': FilteroutFunction,
new file mode 100644
--- /dev/null
+++ b/build/pymake/tests/dotslash-dir.mk
@@ -0,0 +1,8 @@
+#T grep-for: "dotslash-built"
+.PHONY: $(dir foo)
+
+all: $(dir foo)
+	@echo TEST-PASS
+
+$(dir foo):
+	@echo dotslash-built
new file mode 100644
--- /dev/null
+++ b/build/pymake/tests/dotslash-parse.mk
@@ -0,0 +1,4 @@
+./:
+
+# This is merely a test to see that pymake doesn't choke on parsing ./
+$(info TEST-PASS)
new file mode 100644
--- /dev/null
+++ b/build/pymake/tests/dotslash-phony.mk
@@ -0,0 +1,3 @@
+.PHONY: ./
+./:
+	@echo TEST-PASS
new file mode 100644
--- /dev/null
+++ b/build/pymake/tests/info.mk
@@ -0,0 +1,8 @@
+#T grep-for: "info-printed\ninfo-nth"
+all:
+
+INFO = info-printed
+
+$(info $(INFO))
+$(info $(subst second,nth,info-second))
+$(info TEST-PASS)
new file mode 100644
--- /dev/null
+++ b/build/pymake/tests/parentheses.mk
@@ -0,0 +1,2 @@
+all:
+	@(echo TEST-PASS)
--- a/build/pymake/tests/runtests.py
+++ b/build/pymake/tests/runtests.py
@@ -142,17 +142,17 @@ for makefile in makefiles:
             d['returncode'] = data
         elif key == 'returncode-on':
             if sys.platform in data:
                 d['returncode'] = data[sys.platform]
         elif key == 'environment':
             for k, v in data.iteritems():
                 d['env'][k] = v
         elif key == 'grep-for':
-            grepfor = data
+            d['grepfor'] = data
         elif key == 'fail':
             d['pass'] = False
         elif key == 'skip':
             d['skip'] = True
         else:
             print >>sys.stderr, "%s: Unexpected #T key: %s" % (makefile, key)
             sys.exit(1)