diff options
Diffstat (limited to 'source4/script')
| -rwxr-xr-x | source4/script/build_idl.sh | 36 | ||||
| -rwxr-xr-x | source4/script/harness2subunit.pl | 6 | ||||
| -rwxr-xr-x | source4/script/installheader.pl | 2 |
3 files changed, 7 insertions, 37 deletions
diff --git a/source4/script/build_idl.sh b/source4/script/build_idl.sh deleted file mode 100755 index ea0cb78b0e..0000000000 --- a/source4/script/build_idl.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -FULLBUILD=$1 -shift 1 -PIDL_EXTRA_ARGS="$*" - -[ -d librpc/gen_ndr ] || mkdir -p librpc/gen_ndr || exit 1 - -PIDL="$PERL $srcdir/pidl/pidl --outputdir librpc/gen_ndr --header --ndr-parser --server --client --swig --ejs --python $PIDL_EXTRA_ARGS" - -if [ x$FULLBUILD = xFULL ]; then - echo Rebuilding all idl files in librpc/idl - $PIDL $srcdir/librpc/idl/*.idl || exit 1 - exit 0 -fi - -list="" - -for f in $srcdir/librpc/idl/*.idl ; do - basename=`basename $f .idl` - ndr="librpc/gen_ndr/ndr_$basename.c" - # blergh - most shells don't have the -nt function - if [ -f $ndr ]; then - if [ x`find $f -newer $ndr -print` = x$f ]; then - list="$list $f" - fi - else - list="$list $f" - fi -done - -if [ "x$list" != x ]; then - $PIDL $list || exit 1 -fi - -exit 0 diff --git a/source4/script/harness2subunit.pl b/source4/script/harness2subunit.pl index c14e4730e0..9f2391ad6c 100755 --- a/source4/script/harness2subunit.pl +++ b/source4/script/harness2subunit.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl my $firstline = 1; - +my $error = 0; while(<STDIN>) { if ($firstline) { $firstline = 0; @@ -10,6 +10,7 @@ while(<STDIN>) { if (/^not ok (\d+) - (.*)$/) { print "test: $2\n"; print "failure: $2\n"; + $error = 1; } elsif (/^ok (\d+) - (.*)$/) { print "test: $2\n"; print "success: $2\n"; @@ -22,7 +23,10 @@ while(<STDIN>) { } elsif (/^not ok (\d+)$/) { print "test: $1\n"; print "failure: $1\n"; + $error = 1; } else { print; } } +exit $error; + diff --git a/source4/script/installheader.pl b/source4/script/installheader.pl index d1f96b2592..6b10bde65f 100755 --- a/source4/script/installheader.pl +++ b/source4/script/installheader.pl @@ -60,6 +60,8 @@ sub install_header($$) while (<IN>) { $lineno++; + die("Will not install autogenerated header $src") if (/This file was automatically generated by mkproto.pl. DO NOT EDIT/); + if (/^#include \"(.*)\"/) { print OUT "#include <" . rewrite_include("$src:$lineno", $1) . ">\n"; } else { |