[PATCH] remove pidl check-clean-tree check from autobuild
Andrew Bartlett
abartlet at samba.org
Thu May 23 05:57:22 MDT 2013
On Thu, 2013-05-23 at 13:23 +0200, jelmer at samba.org wrote:
> On Thu, May 23, 2013 at 01:44:06PM +1000, Andrew Bartlett wrote:
> > I've been testing the remove-autoconf branch, and I hit up against this
> > issue. On Fedora 18, I just can't do an autobuild locally until I
> > remove this check-clean-tree check.
> >
> > I think it's safe to remove, because while the script talks about
> > uncommited changes, the way autobuild works it only sees real commits.
> > What it does find (very well) is additional or changed files generated
> > by the build process in the source tree, ABI files in particular.
> >
> > In pidl, we re-generate with yapp some files, but we do it in place.
> > Sadly something has changed, and the output order has changed. I can't
> > just commit the result, because others would get the error as it changes
> > back (the old commited configure script issue). So I think the best
> > thing is to remove this check from autobuild, for pidl ONLY.
> >
> > Comments and better suggestions welcome, as is review/push if this is
> > the best approach.
> Dropping this test means dropping out of tree build support. Do we really want
> to do that?
I'm confused. The reason it's tripping up is that it I get the attached.
I think that happens because the autobuild is being done in-tree.
Andrew Bartlett
--
Andrew Bartlett http://samba.org/~abartlet/
Authentication Developer, Samba Team http://samba.org
-------------- next part --------------
Appending installation info to /data/autobuild/b21454/prefix/pidl/lib64/perl5/perllocal.pod
pidl: [check-clean-tree] Running ../script/clean-source-tree.sh
The tree has uncommitted changes!!! see stderr
==> pidl.stderr <==
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,
"{" => 74,
+ "&" => 75,
"/" => 76,
"=" => 77,
- "|" => 79,
"(" => 78,
- "*" => 80,
+ "|" => 79,
"." => 81,
- "]" => 206,
">" => 82
}
},
@@ -1570,18 +1570,18 @@ sub new {
ACTIONS => {
"-" => 69,
":" => 68,
- "?" => 70,
"<" => 71,
";" => 208,
"+" => 73,
"~" => 72,
- "&" => 75,
+ "*" => 80,
+ "?" => 70,
"{" => 74,
+ "&" => 75,
"/" => 76,
"=" => 77,
- "|" => 79,
"(" => 78,
- "*" => 80,
+ "|" => 79,
"." => 81,
">" => 82
}
@@ -1705,18 +1705,18 @@ sub new {
ACTIONS => {
"-" => 69,
":" => 68,
- "?" => 70,
"<" => 71,
";" => 214,
"+" => 73,
"~" => 72,
- "&" => 75,
+ "*" => 80,
+ "?" => 70,
"{" => 74,
+ "&" => 75,
"/" => 76,
"=" => 77,
- "|" => 79,
"(" => 78,
- "*" => 80,
+ "|" => 79,
"." => 81,
">" => 82
}
waiting for tail to flush
pidl: [check-clean-tree] failed '../script/clean-source-tree.sh' with status 1
Logs in logs.tar.gz
More information about the samba-technical
mailing list