[PATCH] Make autobuild on newer ubuntu possible

Andrew Bartlett abartlet at samba.org
Sun Apr 12 21:09:24 MDT 2015


On Sat, 2015-03-21 at 07:09 +1300, Andrew Bartlett wrote:
> On Fri, 2015-03-20 at 13:35 +0100, Jelmer Vernooij wrote:
> > On Fri, Mar 20, 2015 at 06:31:33PM +1300, Andrew Bartlett wrote:
> > > This patch allows me to run autobuild, with all the perl packages
> > > installed, on Ubuntu 14.04 by setting an environment variable. 
> > > 
> > > Otherwise, we fail the check-clean-tree test, as the output changes.
> > 
> > Wouldn't it be sufficient to add those files to .gitignore?
> 
> The issue is the 'save the build files back into the tree' step, used to
> ensure we have a copy of these in GIT for those without all the right
> tools to regenerate the pidl parser.
> 
> On Ubuntu 14.04, that parser is different.  Folks don't notice it on
> autobuild on other hosts normally because the whole thing is skipped if
> you don't have MakeMaker.

Can I please get a review on this patch?  

I'm trying to chase down issues that prevent running autobuild on
multiple platforms, and this allows me to work around one of them.  Even
building on ubuntu 12.04 gives different results in the pidl build.

Yes, I would like it if PIDL didn't write back into the tree (except
when making a release), but that is a second step and would increase our
perl dependencies for GIT builds. 

Andrew Bartlett

To be clear, this is what I get in an autobuild on ubuntu 12.04:

The tree has uncommitted changes!!!
git diff -p --stat HEAD
 pidl/lib/Parse/Pidl/Expr.pm |    2 +-
 pidl/lib/Parse/Pidl/IDL.pm  |   26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pidl/lib/Parse/Pidl/Expr.pm b/pidl/lib/Parse/Pidl/Expr.pm
index 24581d2..d6f8b64 100644
--- a/pidl/lib/Parse/Pidl/Expr.pm
+++ b/pidl/lib/Parse/Pidl/Expr.pm
@@ -653,8 +653,8 @@ sub new {
                        "&" => 4,
                        'TEXT' => 6,
                        'NUM' => 5,
-                       "!" => 8,
                        "(" => 7,
+                       "!" => 8,
                        "*" => 9,
                        'VAR' => 10
                },
diff --git a/pidl/lib/Parse/Pidl/IDL.pm b/pidl/lib/Parse/Pidl/IDL.pm
index 6927c89..8c7cc59 100644
--- a/pidl/lib/Parse/Pidl/IDL.pm
+++ b/pidl/lib/Parse/Pidl/IDL.pm
@@ -1536,19 +1536,19 @@ sub new {
                ACTIONS => {
                        "-" => 69,
                        ":" => 68,
-                       "?" => 70,
                        "<" => 71,
                        "+" => 73,
                        "~" => 72,
-                       "&" => 75,
+                       "*" => 80,
+                       "]" => 206,
+                       "?" => 70,
...

-- 
Andrew Bartlett
http://samba.org/~abartlet/
Authentication Developer, Samba Team  http://samba.org
Samba Developer, Catalyst IT          http://catalyst.net.nz/services/samba






More information about the samba-technical mailing list