From 7c473115e115e72d49274bc869dfec6449e331f5 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Fri, 17 Aug 2001 08:12:31 +0000 Subject: [PATCH] Removing hardcoded test for TestGtkEmbed as not all of our platforms build TestGtkEmbed by default git-svn-id: svn://10.0.0.236/trunk@101282 18797224-902f-48f8-a5cc-f745e15eee43 --- .../tools/tinderbox/build-seamonkey-util.pl | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/mozilla/tools/tinderbox/build-seamonkey-util.pl b/mozilla/tools/tinderbox/build-seamonkey-util.pl index a58de8f1572..2490ba01512 100644 --- a/mozilla/tools/tinderbox/build-seamonkey-util.pl +++ b/mozilla/tools/tinderbox/build-seamonkey-util.pl @@ -18,7 +18,7 @@ use POSIX qw(sys_wait_h strftime); use Cwd; use File::Basename; # for basename(); use Config; # for $Config{sig_name} and $Config{sig_num} -$::UtilsVersion = '$Revision: 1.58 $ '; +$::UtilsVersion = '$Revision: 1.59 $ '; package TinderUtils; @@ -651,17 +651,19 @@ sub BuildIt { print_log "Error: binary not found: $binary_basename\n"; $build_status = 'busted'; } else { - $build_status = 'success'; - } + $build_status = 'success'; + } - # TestGtkEmbed built by default, report if not found. - if (not BinaryExists($full_embed_binary_name)) { - print_log "Error: binary not found: $Settings::EmbedBinaryName\n"; - $build_status = 'busted'; - } else { - $build_status = 'success'; - } - } + # TestGtkEmbed is only built by default on certain platforms. + if (($Settings::EmbedTest or $Settings::BuildEmbed)) { + if (not BinaryExists($full_embed_binary_name)) { + print_log "Error: binary not found: $Settings::EmbedBinaryName\n"; + $build_status = 'busted'; + } else { + $build_status = 'success'; + } + } + } if ($build_status ne 'busted' and BinaryExists($full_binary_name)) { print_log "$binary_basename binary exists, build successful.\n";