Reviewers: felix8a,

Description:
In particular, when working in a non-SVN tree, svnversion produces the
string "exported", which was not matched, causing all version-skew tests
to fail.

Please review this at https://codereview.appspot.com/10743045/

Affected files:
  M     build.xml


Index: build.xml
===================================================================
--- build.xml   (revision 5462)
+++ build.xml   (working copy)
@@ -1458,7 +1458,7 @@
     </copy>
     <replaceregexp
         flags="g"
-        match="(cajaBuildVersion\s*=|'cajolerVersion':)\s*'[m\d]+'"
+ match="(cajaBuildVersion\s*=|'cajolerVersion':)\s*'([\dmsp_]+| exported)'"
         replace="\1'0000'">
       <fileset dir="${war}/testing/skew-0000" includes="**/*.js"/>
     </replaceregexp>
@@ -1472,7 +1472,7 @@
     </copy>
     <replaceregexp
         flags="g"
-        match="(cajaBuildVersion\s*=|'cajolerVersion':)\s*'[m\d]+'"
+ match="(cajaBuildVersion\s*=|'cajolerVersion':)\s*'([\dmsp_]+| exported)'"
         replace="\1'${ver.mmm}'">
       <fileset dir="${war}/testing/skew-mmm" includes="**/*.js"/>
     </replaceregexp>


--

--- You received this message because you are subscribed to the Google Groups "Google Caja Discuss" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to