A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include path to Diff.pm file in the perl script
[simgrid.git]
/
buildtools
/
Cmake
/
Scripts
/
tesh.pl
diff --git
a/buildtools/Cmake/Scripts/tesh.pl
b/buildtools/Cmake/Scripts/tesh.pl
index
aef4938
..
a7e5ddc
100755
(executable)
--- a/
buildtools/Cmake/Scripts/tesh.pl
+++ b/
buildtools/Cmake/Scripts/tesh.pl
@@
-15,7
+15,9
@@
B<tesh> [I<options>] I<tesh_file>
=cut
my($bindir)=".";
my($srcdir)=".";
=cut
my($bindir)=".";
my($srcdir)=".";
+my($timeout)=0;
my $path = $0;
my $path = $0;
+my $OS;
$path =~ s|[^/]*$||;
push @INC,$path;
$path =~ s|[^/]*$||;
push @INC,$path;
@@
-24,12
+26,10
@@
use strict;
use Term::ANSIColor;
use IPC::Open3;
use Term::ANSIColor;
use IPC::Open3;
-my($OS)=`echo %OS%`;
-if($OS eq "%OS%\n"){
+if($^O eq "linux"){
$OS = "UNIX";
}
else{
$OS = "UNIX";
}
else{
- print("$OS and %OS%\n");
$OS = "WIN";
}
$OS = "WIN";
}
@@
-68,6
+68,10
@@
sub cd_cmd {
}
}
}
}
+sub timeout_cmd{
+ $timeout=$_[1];
+}
+
sub setenv_cmd {
my($var,$ctn);
if ($_[0] =~ /^(.*)=(.*)$/) {
sub setenv_cmd {
my($var,$ctn);
if ($_[0] =~ /^(.*)=(.*)$/) {
@@
-121,6
+125,7
@@
sub get_options {
'debug|d' => \$opt{"debug"},
'cd=s' => \&cd_cmd,
'debug|d' => \$opt{"debug"},
'cd=s' => \&cd_cmd,
+ 'timeout=s' => \&timeout_cmd,
'setenv=s' => \&setenv_cmd,
'cfg=s' => \@cfg,
'log=s' => \$log,
'setenv=s' => \&setenv_cmd,
'cfg=s' => \@cfg,
'log=s' => \$log,
@@
-140,7
+145,6
@@
my %opts = get_options(@ARGV);
##
my($sort)=0;
my($nb_arg)=0;
##
my($sort)=0;
my($nb_arg)=0;
-my($timeout)=0;
my($old_buffer);
my($linebis);
my($SIGABRT)=0;
my($old_buffer);
my($linebis);
my($SIGABRT)=0;
@@
-436,6
+440,8
@@
if (defined($cmd{'cmd'})) {
#push @a,"AZE"; push @b,"EZA";
#print "Different:\n".build_diff(\@a,\@b);
#push @a,"AZE"; push @b,"EZA";
#print "Different:\n".build_diff(\@a,\@b);
+use lib "@CMAKE_BINARY_DIR@/bin" ;
+
use Diff qw(diff); # postpone a bit to have time to change INC
sub build_diff {
use Diff qw(diff); # postpone a bit to have time to change INC
sub build_diff {