diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-11 22:11:45 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-11 22:11:45 -0300 |
| commit | 01fac01fcb8830923bc85ba8d13146921d821dac (patch) | |
| tree | f9bc27e620621001442074cc2898dc6c796d70c8 /v4l/scripts/do_merge.pl | |
| parent | 39ae4cb418ef242558b61172ca37807dd184fb70 (diff) | |
| parent | 2c8b481bed8efbeda28d5b75e0aeb5c089fc76e8 (diff) | |
| download | mediapointer-dvb-s2-01fac01fcb8830923bc85ba8d13146921d821dac.tar.gz mediapointer-dvb-s2-01fac01fcb8830923bc85ba8d13146921d821dac.tar.bz2 | |
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l/scripts/do_merge.pl')
| -rwxr-xr-x | v4l/scripts/do_merge.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/v4l/scripts/do_merge.pl b/v4l/scripts/do_merge.pl index 0a4433a21..1a6bbb1ee 100755 --- a/v4l/scripts/do_merge.pl +++ b/v4l/scripts/do_merge.pl @@ -153,7 +153,10 @@ if ($n_heads == 2) { # Test resulting tree print "Testing if the build didn't break compilation. Only errors and warnings will be displayed. Please wait.\n"; -$ret = system ('make all|egrep -v "^\s*CC"|egrep -v "^\s*LD"'); +$ret = system ('make allmodconfig'); +if (!ret) { + $ret = system ('make mismatch|egrep -v "^\s*CC"|egrep -v "^\s*LD"'); +} if ($ret) { print "Build failed. Can't procceed.\n"; |