From 0ac7d52a3f44887d2b9a827c9f48afe942edef71 Mon Sep 17 00:00:00 2001 From: daisieh_local Date: Tue, 22 Jul 2014 12:24:55 -0700 Subject: [PATCH] Merge branch 'brew' --- configure.pl | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/configure.pl b/configure.pl index 3650cc2..ad710c4 100755 --- a/configure.pl +++ b/configure.pl @@ -5,6 +5,8 @@ use Configuration; use System; +my $no_interactive = shift; + # find or make config.txt: my $config_file = "$FindBin::Bin/lib/config.txt"; unless (-e $config_file) { @@ -105,25 +107,28 @@ print "If software is installed but not included in \$PATH, edit the appropriate line in config.txt.\n"; } -print "\nWould you like to run aTRAM functionality tests (may take a few minutes)? [Y/n]\n"; -my $userpath = ; -while ($userpath !~ /[yY]\n/) { - if ($userpath =~ /[nN]\n/) { - exit; - } - if ($userpath =~ /^\n/) { - last; + +if (!(defined $no_interactive)) { + print "\nWould you like to run aTRAM functionality tests (may take a few minutes)? [Y/n]\n"; + my $userpath = ; + while ($userpath !~ /[yY]\n/) { + if ($userpath =~ /[nN]\n/) { + exit; + } + if ($userpath =~ /^\n/) { + last; + } + $userpath = ; } - $userpath = ; -} -my $executing_path = $FindBin::Bin; + my $executing_path = $FindBin::Bin; -print $i++ .". Verifying aTRAM functionality, please wait...\n"; -`$executing_path/test/test_all.pl`; -if ($? == 0) { - print "Looks good! You are ready to aTRAM it up!\n"; -} else { - print "Something went wrong in testing...run \"aTRAM/test/test_all.pl debug\" and examine the results of debug.log.\n"; -} + print $i++ .". Verifying aTRAM functionality, please wait...\n"; + `$executing_path/test/test_all.pl`; + if ($? == 0) { + print "Looks good! You are ready to aTRAM it up!\n"; + } else { + print "Something went wrong in testing...run \"aTRAM/test/test_all.pl debug\" and examine the results of debug.log.\n"; + } +}