| $NAME: | "
fi
@@ -193,13 +199,12 @@
html "$SEQ"
fi
html ""
-
+
elif [ "$TYPE" == "package" ]; then
BINPACKAGE=$2
else
html $@
fi
-
}
aexec() {
@@ -214,7 +219,6 @@
if [ -f $OUTDIR/x73010test.log ]; then
cat $OUTDIR/x73010test.log >>$OUT
fi
-
}
tlog() {
@@ -321,38 +325,36 @@
head
TESTPART="Part I: Build"
EXITONFAILURE=true
-if [ "$FCO" != "1" ]; then
+if [ "$SKIP_CHECKOUT" != "1" ]; then
TEST="Checkout CoG"
pexec rm -rf cog
- vexec svn co https://cogkit.svn.sourceforge.net/svnroot/cogkit/trunk/current/src/cog
+ COG="https://cogkit.svn.sourceforge.net/svnroot/cogkit/trunk/current/src/cog"
+ vexec svn co $COG
TEST="Checkout Swift"
- pexec rm -rf trunk
- #vexec cvs -d :pserver:anonymous at cvs.cogkit.org:/cvs/cogkit co src/vdsk
- vexec svn co https://svn.ci.uchicago.edu/svn/vdl2/trunk
+ pexec cd cog/modules
+ pexec rm -rf swift
+ vexec svn co https://svn.ci.uchicago.edu/svn/vdl2/$BRANCH swift
+ pexec cd $OUTDIR
fi
-TEST="Directory setup"
-pexec mkdir cog/modules/vdsk
-vexec cp -r trunk/* cog/modules/vdsk
-
TEST="Compile"
-pexec cd cog/modules/vdsk
+pexec cd cog/modules/swift
pexec rm -rf dist
vexec ant -quiet dist
TEST="Package"
pexec cd dist
-VDSK=`ls -d vdsk*.*`
-pexec cd $VDSK/lib
+SWIFT=$( ls -d swift-* )
+pexec cd $SWIFT/lib
pexec rm -f castor*.jar *gt2ft*.jar ant.jar
pexec cd ../..
-pexec rm -rf vdsk-$DATE
-pexec mv $VDSK vdsk-$DATE
-vexec tar -pczf $OUTDIR/vdsk-$DATE.tar.gz vdsk-$DATE
-out package "vdsk-$DATE.tar.gz"
+pexec rm -rf swift-$DATE
+pexec mv $SWIFT swift-$DATE
+vexec tar -pczf $OUTDIR/swift-$DATE.tar.gz swift-$DATE
+out package "swift-$DATE.tar.gz"
-PATH=$PWD/vdsk-$DATE/bin:$PATH
+PATH=$PWD/swift-$DATE/bin:$PATH
cd ..
TESTDIR=$PWD/tests
echo "Path: $PATH" >>$OUT
@@ -361,21 +363,18 @@
EXITONFAILURE=false
TESTPART="Part II: Local Tests"
-for TEST in `ls $TESTDIR/*.dtm $TESTDIR/*.swift`; do
- BN=`basename $TEST`
- echo $BN
- cp $TESTDIR/$BN .
-
-
- TESTNAME=${BN%.dtm}
- TESTNAME=${TESTNAME%.swift}
- TEST="$TESTNAME"
-
- ssexec "Compile" vdlc $BN
- for ((i=0; $i<9; i=$i+1)); do
- pexec swift -sites.file ~/.vdl2/sites-local.xml $TESTNAME.kml
- done
- vexec swift -sites.file ~/.vdl2/sites-local.xml $TESTNAME.kml
+for TEST in $( ls $TESTDIR/*.swift ); do # $TESTDIR/*.dtm
+ TESTNAME=$( basename $TEST)
+ echo TESTNAME: $TESTNAME
+ cp -uv $TESTDIR/$TESTNAME .
+
+ TEST="$TESTNAME"
+
+ # ssexec "Compile" vdlc $BN
+ for ((i=0; $i<9; i=$i+1)); do
+ pexec swift -sites.file ~/.vdl2/sites-local.xml $TESTNAME
+ done
+ vexec swift -sites.file ~/.vdl2/sites-local.xml $TESTNAME
done
TESTPART="Part III: Grid Tests"
@@ -384,11 +383,11 @@
BN=`basename $TEST`
echo $BN
cp $TESTDIR/$BN .
-
+
TESTNAME=${BN%.dtm}
TESTNAME=${TESTNAME%.swift}
TEST="$TESTNAME"
-
+
ssexec "Compile" vdlc $BN
for ((i=0; $i<9; i=$i+1)); do
pexec swift -sites.file ~/.vdl2/sites-grid.xml $TESTNAME.kml
@@ -397,4 +396,4 @@
done
#Don't remove me:
-tail
+footer
Deleted: branches/tests-01/tests/range.dtm
===================================================================
--- branches/tests-01/tests/range.dtm 2010-07-19 21:06:11 UTC (rev 3445)
+++ branches/tests-01/tests/range.dtm 2010-07-19 21:10:01 UTC (rev 3446)
@@ -1,5 +0,0 @@
-int nums[] = [0:20:2]; // generate a list 0, 2, 4, 6, 8 ...
-
-foreach num in nums {
- print(num);
-}
Copied: branches/tests-01/tests/range.swift (from rev 3445, branches/tests-01/tests/range.dtm)
===================================================================
--- branches/tests-01/tests/range.swift (rev 0)
+++ branches/tests-01/tests/range.swift 2010-07-19 21:10:01 UTC (rev 3446)
@@ -0,0 +1,5 @@
+int nums[] = [0:20:2]; // generate a list 0, 2, 4, 6, 8 ...
+
+foreach num in nums {
+ print(num);
+}
From noreply at svn.ci.uchicago.edu Tue Jul 20 02:18:20 2010
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Tue, 20 Jul 2010 02:18:20 -0500 (CDT)
Subject: [Swift-commit] r3447 - usertools/swift/swiftconfig/bin
Message-ID: <20100720071820.F41049CCAA@vm-125-59.ci.uchicago.edu>
Author: davidk
Date: 2010-07-20 02:18:20 -0500 (Tue, 20 Jul 2010)
New Revision: 3447
Added:
usertools/swift/swiftconfig/bin/swiftrun
Log:
swiftrun
Added: usertools/swift/swiftconfig/bin/swiftrun
===================================================================
--- usertools/swift/swiftconfig/bin/swiftrun (rev 0)
+++ usertools/swift/swiftconfig/bin/swiftrun 2010-07-20 07:18:20 UTC (rev 3447)
@@ -0,0 +1,127 @@
+#!/usr/bin/perl
+
+use Cwd;
+use Cwd qw(abs_path);
+use File::Copy;
+use File::Path qw(remove_tree);
+
+my $swifthome = '';
+if ( $ENV{'SWIFT_HOME'} && -e "$ENV{'SWIFT_HOME'}/bin/swift" ) {
+ $swifthome = $ENV{'SWIFT_HOME'};
+}
+
+my @path = split( '/', abs_path($0) );
+my @path = splice( @path, 0, $#path - 1 );
+my $parent_directory = join( '/', @path );
+
+if ( !$swifthome ) {
+ if ( -e "$parent_directory/bin/swift" ) {
+ $swifthome = $parent_directory;
+ }
+
+ else {
+ @path = split( '/', which("swift") );
+ @path = splice( @path, 0, $#path - 1 );
+ my $tmp = join( '/', @path );
+ if ( -e "$tmp/bin/swift" ) {
+ $swifthome = $tmp;
+ }
+ }
+}
+
+# Create a new directory if it does not exist
+sub create_directory {
+ $directory = $_[0];
+ if ( !-d "$directory" ) {
+ mkdir "$directory", 0700
+ or die "Unable to create directory $directory\n";
+ }
+}
+
+# Append one file to another
+sub cat_file {
+ my ($src, $dst) = @_;
+ if(-e $dst){ open(DSTFILE, ">>$dst") or die "Unable to open $dst for append\n"; }
+ else { open(DSTFILE, ">$dst") or die "Unable to open $dst for writing\n"; }
+ open(SRCFILE, $src) || die "Unable to open $src for reading\n";
+ foreach $line() {
+ print DSTFILE $line;
+ }
+}
+
+# Copy a file to a new location
+sub copy_file {
+ my ($src, $dst) = @_;
+ if(!-e $src) { die "Unable to access $src\n"; }
+ if(!-e $dst) { die "Unable to access $dst\n"; }
+ copy($src, $dst) or die "Unable to copy $src to $dst\n";
+}
+
+# Strip directory name out of script
+sub strip_directory {
+ my ($fullpath) = @_;
+ my @path = split( '/', $fullpath);
+ my $filename = @path[$#path];
+ return $filename;
+}
+
+use FindBin qw($Bin);
+use lib "$FindBin::Bin/../lib/perl";
+use Getopt::Long;
+use File::Which qw(which where);
+use XML::Simple;
+use Data::Dumper;
+
+GetOptions(
+ 'site=s' => \$site,
+ 'script=s' => \$script,
+);
+
+# Verify user-created profile info exists
+my ($seconds, $minutes, $hours, $days, $months, $years, @junk) = localtime(time);
+$datestring = sprintf "%04s%02s%02s%02s%02s%02s%s", $years+1900, $months+1, $days, $hours, $minutes, $seconds, getpgrp(0);
+my $dotswift = "$ENV{'HOME'}/.swift";
+
+
+# Run job
+ at sites = split(/,/, $site);
+my $script_filename = strip_directory($script);
+create_directory("$dotswift/jobs");
+create_directory("$dotswift/jobs/$script_filename");
+create_directory("$dotswift/jobs/$script_filename/$datestring");
+copy_file("$script", "$dotswift/jobs/$script_filename/$datestring");
+
+# Temporarily rename existing auth.defaults
+if(-e "$ENV{'HOME'}/.ssh/auth.defaults") {
+ move("$ENV{'HOME'}/.ssh/auth.defaults", "$ENV{'HOME'}/.ssh/auth.defaults.$datestring") || die "Unable to rename $ENV{'HOME'}/.ssh/auth.defaults";
+}
+
+foreach my $s(@sites) {
+ if(!-d "$dotswift/sites/$s"){ print "$dotswift/sites/$site\n"; die "Unable to find entry for $s\n"; }
+ if(!-e "$dotswift/sites/$s/sites.xml"){ die "Unable to find sites.xml for $s\n"; }
+ if(!-e "$dotswift/sites/$s/tc.data"){ die "Unable to find tc.data for $s\n"; }
+ cat_file("$dotswift/sites/$s/sites.xml", "$dotswift/jobs/$script_filename/$datestring/sites.xml");
+ cat_file("$dotswift/sites/$s/tc.data", "$dotswift/jobs/$script_filename/$datestring/tc.data");
+ if(-e "$dotswift/sites/$s/auth.defaults"){
+ cat_file("$dotswift/sites/$s/auth.defaults", "$ENV{'HOME'}/.ssh/auth.defaults");
+ }
+}
+
+# Rename auths.default back to original
+if(-e "$ENV{'HOME'}/.ssh/auth.defaults.$datestring") {
+ move("$ENV{'HOME'}/.ssh/auth.defaults.$datestring", "$ENV{'HOME'}/.ssh/auth.defaults") || die "Unable to rename $ENV{'HOME'}/.ssh/auth.defaults.$datestring";
+}
+
+# Update XML tags
+open(SITEFILE, "$dotswift/jobs/$script_filename/$datestring/sites.xml") || die "Unable to open $dotswift/jobs/$script_filename/$datestring/sites.xml\n";
+my @sitedata = ;
+close(SITEFILE);
+open(SITEFILE, ">$dotswift/jobs/$script_filename/$datestring/sites.xml") || die "Unable to open $dotswift/jobs/$script_filename/$datestring/sites.xml\n";
+print SITEFILE "\n at sitedata\n";
+close(SITEFILE);
+
+# Run swift
+chdir("$dotswift/jobs/$script_filename/$datestring") || die "Unable to change directories to $dotswift/job/$script_filename/$datestring\n";
+print "Submitting job. Check $dotswift/jobs/$script_filename/$datestring for details\n";
+system("swift -sites.file $dotswift/jobs/$script_filename/$datestring/sites.xml -tc.file $dotswift/jobs/$script_filename/$datestring/tc.data $script");
+
Property changes on: usertools/swift/swiftconfig/bin/swiftrun
___________________________________________________________________
Name: svn:executable
+ *
From noreply at svn.ci.uchicago.edu Tue Jul 20 02:36:24 2010
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Tue, 20 Jul 2010 02:36:24 -0500 (CDT)
Subject: [Swift-commit] r3448 - usertools/swift/swiftconfig/lib/perl/File
Message-ID: <20100720073624.DC3C69CCAA@vm-125-59.ci.uchicago.edu>
Author: davidk
Date: 2010-07-20 02:36:24 -0500 (Tue, 20 Jul 2010)
New Revision: 3448
Added:
usertools/swift/swiftconfig/lib/perl/File/Path.pm
Log:
Include correct version of File::Path to avoid issues with older version which handled file deletion differently
Added: usertools/swift/swiftconfig/lib/perl/File/Path.pm
===================================================================
--- usertools/swift/swiftconfig/lib/perl/File/Path.pm (rev 0)
+++ usertools/swift/swiftconfig/lib/perl/File/Path.pm 2010-07-20 07:36:24 UTC (rev 3448)
@@ -0,0 +1,895 @@
+package File::Path;
+
+use 5.005_04;
+use strict;
+
+use Cwd 'getcwd';
+use File::Basename ();
+use File::Spec ();
+
+BEGIN {
+ if ($] < 5.006) {
+ # can't say 'opendir my $dh, $dirname'
+ # need to initialise $dh
+ eval "use Symbol";
+ }
+}
+
+use Exporter ();
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
+$VERSION = '2.07_03';
+ at ISA = qw(Exporter);
+ at EXPORT = qw(mkpath rmtree);
+ at EXPORT_OK = qw(make_path remove_tree);
+
+my $Is_VMS = $^O eq 'VMS';
+my $Is_MacOS = $^O eq 'MacOS';
+
+# These OSes complain if you want to remove a file that you have no
+# write permission to:
+my $Force_Writeable = grep {$^O eq $_} qw(amigaos dos epoc MSWin32 MacOS os2);
+
+# Unix-like systems need to stat each directory in order to detect
+# race condition. MS-Windows is immune to this particular attack.
+my $Need_Stat_Check = !($^O eq 'MSWin32');
+
+sub _carp {
+ require Carp;
+ goto &Carp::carp;
+}
+
+sub _croak {
+ require Carp;
+ goto &Carp::croak;
+}
+
+sub _error {
+ my $arg = shift;
+ my $message = shift;
+ my $object = shift;
+
+ if ($arg->{error}) {
+ $object = '' unless defined $object;
+ $message .= ": $!" if $!;
+ push @{${$arg->{error}}}, {$object => $message};
+ }
+ else {
+ _carp(defined($object) ? "$message for $object: $!" : "$message: $!");
+ }
+}
+
+sub make_path {
+ push @_, {} unless @_ and UNIVERSAL::isa($_[-1],'HASH');
+ goto &mkpath;
+}
+
+sub mkpath {
+ my $old_style = !(@_ and UNIVERSAL::isa($_[-1],'HASH'));
+
+ my $arg;
+ my $paths;
+
+ if ($old_style) {
+ my ($verbose, $mode);
+ ($paths, $verbose, $mode) = @_;
+ $paths = [$paths] unless UNIVERSAL::isa($paths,'ARRAY');
+ $arg->{verbose} = $verbose;
+ $arg->{mode} = defined $mode ? $mode : 0777;
+ }
+ else {
+ $arg = pop @_;
+ $arg->{mode} = delete $arg->{mask} if exists $arg->{mask};
+ $arg->{mode} = 0777 unless exists $arg->{mode};
+ ${$arg->{error}} = [] if exists $arg->{error};
+ $paths = [@_];
+ }
+ return _mkpath($arg, $paths);
+}
+
+sub _mkpath {
+ my $arg = shift;
+ my $paths = shift;
+
+ my(@created,$path);
+ foreach $path (@$paths) {
+ next unless defined($path) and length($path);
+ $path .= '/' if $^O eq 'os2' and $path =~ /^\w:\z/s; # feature of CRT
+ # Logic wants Unix paths, so go with the flow.
+ if ($Is_VMS) {
+ next if $path eq '/';
+ $path = VMS::Filespec::unixify($path);
+ }
+ next if -d $path;
+ my $parent = File::Basename::dirname($path);
+ unless (-d $parent or $path eq $parent) {
+ push(@created,_mkpath($arg, [$parent]));
+ }
+ print "mkdir $path\n" if $arg->{verbose};
+ if (mkdir($path,$arg->{mode})) {
+ push(@created, $path);
+ }
+ else {
+ my $save_bang = $!;
+ my ($e, $e1) = ($save_bang, $^E);
+ $e .= "; $e1" if $e ne $e1;
+ # allow for another process to have created it meanwhile
+ if (!-d $path) {
+ $! = $save_bang;
+ if ($arg->{error}) {
+ push @{${$arg->{error}}}, {$path => $e};
+ }
+ else {
+ _croak("mkdir $path: $e");
+ }
+ }
+ }
+ }
+ return @created;
+}
+
+sub remove_tree {
+ push @_, {} unless @_ and UNIVERSAL::isa($_[-1],'HASH');
+ goto &rmtree;
+}
+
+sub _is_subdir {
+ my($dir, $test) = @_;
+
+ my($dv, $dd) = File::Spec->splitpath($dir, 1);
+ my($tv, $td) = File::Spec->splitpath($test, 1);
+
+ # not on same volume
+ return 0 if $dv ne $tv;
+
+ my @d = File::Spec->splitdir($dd);
+ my @t = File::Spec->splitdir($td);
+
+ # @t can't be a subdir if it's shorter than @d
+ return 0 if @t < @d;
+
+ return join('/', @d) eq join('/', splice @t, 0, + at d);
+}
+
+sub rmtree {
+ my $old_style = !(@_ and UNIVERSAL::isa($_[-1],'HASH'));
+
+ my $arg;
+ my $paths;
+
+ if ($old_style) {
+ my ($verbose, $safe);
+ ($paths, $verbose, $safe) = @_;
+ $arg->{verbose} = $verbose;
+ $arg->{safe} = defined $safe ? $safe : 0;
+
+ if (defined($paths) and length($paths)) {
+ $paths = [$paths] unless UNIVERSAL::isa($paths,'ARRAY');
+ }
+ else {
+ _carp ("No root path(s) specified\n");
+ return 0;
+ }
+ }
+ else {
+ $arg = pop @_;
+ ${$arg->{error}} = [] if exists $arg->{error};
+ ${$arg->{result}} = [] if exists $arg->{result};
+ $paths = [@_];
+ }
+
+ $arg->{prefix} = '';
+ $arg->{depth} = 0;
+
+ my @clean_path;
+ $arg->{cwd} = getcwd() or do {
+ _error($arg, "cannot fetch initial working directory");
+ return 0;
+ };
+ for ($arg->{cwd}) { /\A(.*)\Z/; $_ = $1 } # untaint
+
+ for my $p (@$paths) {
+ # need to fixup case and map \ to / on Windows
+ my $ortho_root = $^O eq 'MSWin32' ? _slash_lc($p) : $p;
+ my $ortho_cwd = $^O eq 'MSWin32' ? _slash_lc($arg->{cwd}) : $arg->{cwd};
+ my $ortho_root_length = length($ortho_root);
+ $ortho_root_length-- if $^O eq 'VMS'; # don't compare '.' with ']'
+ if ($ortho_root_length && _is_subdir($ortho_root, $ortho_cwd)) {
+ local $! = 0;
+ _error($arg, "cannot remove path when cwd is $arg->{cwd}", $p);
+ next;
+ }
+
+ if ($Is_MacOS) {
+ $p = ":$p" unless $p =~ /:/;
+ $p .= ":" unless $p =~ /:\z/;
+ }
+ elsif ($^O eq 'MSWin32') {
+ $p =~ s{[/\\]\z}{};
+ }
+ else {
+ $p =~ s{/\z}{};
+ }
+ push @clean_path, $p;
+ }
+
+ @{$arg}{qw(device inode perm)} = (lstat $arg->{cwd})[0,1] or do {
+ _error($arg, "cannot stat initial working directory", $arg->{cwd});
+ return 0;
+ };
+
+ return _rmtree($arg, \@clean_path);
+}
+
+sub _rmtree {
+ my $arg = shift;
+ my $paths = shift;
+
+ my $count = 0;
+ my $curdir = File::Spec->curdir();
+ my $updir = File::Spec->updir();
+
+ my (@files, $root);
+ ROOT_DIR:
+ foreach $root (@$paths) {
+ # since we chdir into each directory, it may not be obvious
+ # to figure out where we are if we generate a message about
+ # a file name. We therefore construct a semi-canonical
+ # filename, anchored from the directory being unlinked (as
+ # opposed to being truly canonical, anchored from the root (/).
+
+ my $canon = $arg->{prefix}
+ ? File::Spec->catfile($arg->{prefix}, $root)
+ : $root
+ ;
+
+ my ($ldev, $lino, $perm) = (lstat $root)[0,1,2] or next ROOT_DIR;
+
+ if ( -d _ ) {
+ $root = VMS::Filespec::pathify($root) if $Is_VMS;
+
+ if (!chdir($root)) {
+ # see if we can escalate privileges to get in
+ # (e.g. funny protection mask such as -w- instead of rwx)
+ $perm &= 07777;
+ my $nperm = $perm | 0700;
+ if (!($arg->{safe} or $nperm == $perm or chmod($nperm, $root))) {
+ _error($arg, "cannot make child directory read-write-exec", $canon);
+ next ROOT_DIR;
+ }
+ elsif (!chdir($root)) {
+ _error($arg, "cannot chdir to child", $canon);
+ next ROOT_DIR;
+ }
+ }
+
+ my ($cur_dev, $cur_inode, $perm) = (stat $curdir)[0,1,2] or do {
+ _error($arg, "cannot stat current working directory", $canon);
+ next ROOT_DIR;
+ };
+
+ if ($Need_Stat_Check) {
+ ($ldev eq $cur_dev and $lino eq $cur_inode)
+ or _croak("directory $canon changed before chdir, expected dev=$ldev ino=$lino, actual dev=$cur_dev ino=$cur_inode, aborting.");
+ }
+
+ $perm &= 07777; # don't forget setuid, setgid, sticky bits
+ my $nperm = $perm | 0700;
+
+ # notabene: 0700 is for making readable in the first place,
+ # it's also intended to change it to writable in case we have
+ # to recurse in which case we are better than rm -rf for
+ # subtrees with strange permissions
+
+ if (!($arg->{safe} or $nperm == $perm or chmod($nperm, $curdir))) {
+ _error($arg, "cannot make directory read+writeable", $canon);
+ $nperm = $perm;
+ }
+
+ my $d;
+ $d = gensym() if $] < 5.006;
+ if (!opendir $d, $curdir) {
+ _error($arg, "cannot opendir", $canon);
+ @files = ();
+ }
+ else {
+ no strict 'refs';
+ if (!defined ${"\cTAINT"} or ${"\cTAINT"}) {
+ # Blindly untaint dir names if taint mode is
+ # active, or any perl < 5.006
+ @files = map { /\A(.*)\z/s; $1 } readdir $d;
+ }
+ else {
+ @files = readdir $d;
+ }
+ closedir $d;
+ }
+
+ if ($Is_VMS) {
+ # Deleting large numbers of files from VMS Files-11
+ # filesystems is faster if done in reverse ASCIIbetical order.
+ # include '.' to '.;' from blead patch #31775
+ @files = map {$_ eq '.' ? '.;' : $_} reverse @files;
+ ($root = VMS::Filespec::unixify($root)) =~ s/\.dir\z//;
+ }
+
+ @files = grep {$_ ne $updir and $_ ne $curdir} @files;
+
+ if (@files) {
+ # remove the contained files before the directory itself
+ my $narg = {%$arg};
+ @{$narg}{qw(device inode cwd prefix depth)}
+ = ($cur_dev, $cur_inode, $updir, $canon, $arg->{depth}+1);
+ $count += _rmtree($narg, \@files);
+ }
+
+ # restore directory permissions of required now (in case the rmdir
+ # below fails), while we are still in the directory and may do so
+ # without a race via '.'
+ if ($nperm != $perm and not chmod($perm, $curdir)) {
+ _error($arg, "cannot reset chmod", $canon);
+ }
+
+ # don't leave the client code in an unexpected directory
+ chdir($arg->{cwd})
+ or _croak("cannot chdir to $arg->{cwd} from $canon: $!, aborting.");
+
+ # ensure that a chdir upwards didn't take us somewhere other
+ # than we expected (see CVE-2002-0435)
+ ($cur_dev, $cur_inode) = (stat $curdir)[0,1]
+ or _croak("cannot stat prior working directory $arg->{cwd}: $!, aborting.");
+
+ if ($Need_Stat_Check) {
+ ($arg->{device} eq $cur_dev and $arg->{inode} eq $cur_inode)
+ or _croak("previous directory $arg->{cwd} changed before entering $canon, expected dev=$ldev ino=$lino, actual dev=$cur_dev ino=$cur_inode, aborting.");
+ }
+
+ if ($arg->{depth} or !$arg->{keep_root}) {
+ if ($arg->{safe} &&
+ ($Is_VMS ? !&VMS::Filespec::candelete($root) : !-w $root)) {
+ print "skipped $root\n" if $arg->{verbose};
+ next ROOT_DIR;
+ }
+ if ($Force_Writeable and !chmod $perm | 0700, $root) {
+ _error($arg, "cannot make directory writeable", $canon);
+ }
+ print "rmdir $root\n" if $arg->{verbose};
+ if (rmdir $root) {
+ push @{${$arg->{result}}}, $root if $arg->{result};
+ ++$count;
+ }
+ else {
+ _error($arg, "cannot remove directory", $canon);
+ if ($Force_Writeable && !chmod($perm, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
+ ) {
+ _error($arg, sprintf("cannot restore permissions to 0%o",$perm), $canon);
+ }
+ }
+ }
+ }
+ else {
+ # not a directory
+ $root = VMS::Filespec::vmsify("./$root")
+ if $Is_VMS
+ && !File::Spec->file_name_is_absolute($root)
+ && ($root !~ m/(?]+/); # not already in VMS syntax
+
+ if ($arg->{safe} &&
+ ($Is_VMS ? !&VMS::Filespec::candelete($root)
+ : !(-l $root || -w $root)))
+ {
+ print "skipped $root\n" if $arg->{verbose};
+ next ROOT_DIR;
+ }
+
+ my $nperm = $perm & 07777 | 0600;
+ if ($Force_Writeable and $nperm != $perm and not chmod $nperm, $root) {
+ _error($arg, "cannot make file writeable", $canon);
+ }
+ print "unlink $canon\n" if $arg->{verbose};
+ # delete all versions under VMS
+ for (;;) {
+ if (unlink $root) {
+ push @{${$arg->{result}}}, $root if $arg->{result};
+ }
+ else {
+ _error($arg, "cannot unlink file", $canon);
+ $Force_Writeable and chmod($perm, $root) or
+ _error($arg, sprintf("cannot restore permissions to 0%o",$perm), $canon);
+ last;
+ }
+ ++$count;
+ last unless $Is_VMS && lstat $root;
+ }
+ }
+ }
+ return $count;
+}
+
+sub _slash_lc {
+ # fix up slashes and case on MSWin32 so that we can determine that
+ # c:\path\to\dir is underneath C:/Path/To
+ my $path = shift;
+ $path =~ tr{\\}{/};
+ return lc($path);
+}
+
+1;
+__END__
+
+=head1 NAME
+
+File::Path - Create or remove directory trees
+
+=head1 VERSION
+
+This document describes version 2.07 of File::Path, released
+2008-11-09.
+
+=head1 SYNOPSIS
+
+ use File::Path qw(make_path remove_tree);
+
+ make_path('foo/bar/baz', '/zug/zwang');
+ make_path('foo/bar/baz', '/zug/zwang', {
+ verbose => 1,
+ mode => 0711,
+ });
+
+ remove_tree('foo/bar/baz', '/zug/zwang');
+ remove_tree('foo/bar/baz', '/zug/zwang', {
+ verbose => 1,
+ error => \my $err_list,
+ });
+
+ # legacy (interface promoted before v2.00)
+ mkpath('/foo/bar/baz');
+ mkpath('/foo/bar/baz', 1, 0711);
+ mkpath(['/foo/bar/baz', 'blurfl/quux'], 1, 0711);
+ rmtree('foo/bar/baz', 1, 1);
+ rmtree(['foo/bar/baz', 'blurfl/quux'], 1, 1);
+
+ # legacy (interface promoted before v2.06)
+ mkpath('foo/bar/baz', '/zug/zwang', { verbose => 1, mode => 0711 });
+ rmtree('foo/bar/baz', '/zug/zwang', { verbose => 1, mode => 0711 });
+
+=head1 DESCRIPTION
+
+This module provide a convenient way to create directories of
+arbitrary depth and to delete an entire directory subtree from the
+filesystem.
+
+The following functions are provided:
+
+=over
+
+=item make_path( $dir1, $dir2, .... )
+
+=item make_path( $dir1, $dir2, ...., \%opts )
+
+The C function creates the given directories if they don't
+exists before, much like the Unix command C.
+
+The function accepts a list of directories to be created. Its
+behaviour may be tuned by an optional hashref appearing as the last
+parameter on the call.
+
+The function returns the list of directories actually created during
+the call; in scalar context the number of directories created.
+
+The following keys are recognised in the option hash:
+
+=over
+
+=item mode => $num
+
+The numeric permissions mode to apply to each created directory
+(defaults to 0777), to be modified by the current C. If the
+directory already exists (and thus does not need to be created),
+the permissions will not be modified.
+
+C is recognised as an alias for this parameter.
+
+=item verbose => $bool
+
+If present, will cause C to print the name of each directory
+as it is created. By default nothing is printed.
+
+=item error => \$err
+
+If present, it should be a reference to a scalar.
+This scalar will be made to reference an array, which will
+be used to store any errors that are encountered. See the L section for more information.
+
+If this parameter is not used, certain error conditions may raise
+a fatal error that will cause the program will halt, unless trapped
+in an C block.
+
+=back
+
+=item mkpath( $dir )
+
+=item mkpath( $dir, $verbose, $mode )
+
+=item mkpath( [$dir1, $dir2,...], $verbose, $mode )
+
+=item mkpath( $dir1, $dir2,..., \%opt )
+
+The mkpath() function provide the legacy interface of make_path() with
+a different interpretation of the arguments passed. The behaviour and
+return value of the function is otherwise identical to make_path().
+
+=item remove_tree( $dir1, $dir2, .... )
+
+=item remove_tree( $dir1, $dir2, ...., \%opts )
+
+The C function deletes the given directories and any
+files and subdirectories they might contain, much like the Unix
+command C or C on Windows.
+
+The function accepts a list of directories to be
+removed. Its behaviour may be tuned by an optional hashref
+appearing as the last parameter on the call.
+
+The functions returns the number of files successfully deleted.
+
+The following keys are recognised in the option hash:
+
+=over
+
+=item verbose => $bool
+
+If present, will cause C to print the name of each file as
+it is unlinked. By default nothing is printed.
+
+=item safe => $bool
+
+When set to a true value, will cause C to skip the files
+for which the process lacks the required privileges needed to delete
+files, such as delete privileges on VMS. In other words, the code
+will make no attempt to alter file permissions. Thus, if the process
+is interrupted, no filesystem object will be left in a more
+permissive mode.
+
+=item keep_root => $bool
+
+When set to a true value, will cause all files and subdirectories
+to be removed, except the initially specified directories. This comes
+in handy when cleaning out an application's scratch directory.
+
+ remove_tree( '/tmp', {keep_root => 1} );
+
+=item result => \$res
+
+If present, it should be a reference to a scalar.
+This scalar will be made to reference an array, which will
+be used to store all files and directories unlinked
+during the call. If nothing is unlinked, the array will be empty.
+
+ remove_tree( '/tmp', {result => \my $list} );
+ print "unlinked $_\n" for @$list;
+
+This is a useful alternative to the C key.
+
+=item error => \$err
+
+If present, it should be a reference to a scalar.
+This scalar will be made to reference an array, which will
+be used to store any errors that are encountered. See the L section for more information.
+
+Removing things is a much more dangerous proposition than
+creating things. As such, there are certain conditions that
+C may encounter that are so dangerous that the only
+sane action left is to kill the program.
+
+Use C to trap all that is reasonable (problems with
+permissions and the like), and let it die if things get out
+of hand. This is the safest course of action.
+
+=back
+
+=item rmtree( $dir )
+
+=item rmtree( $dir, $verbose, $safe )
+
+=item rmtree( [$dir1, $dir2,...], $verbose, $safe )
+
+=item rmtree( $dir1, $dir2,..., \%opt )
+
+The rmtree() function provide the legacy interface of remove_tree()
+with a different interpretation of the arguments passed. The behaviour
+and return value of the function is otherwise identical to
+remove_tree().
+
+=back
+
+=head2 ERROR HANDLING
+
+=over 4
+
+=item B
+
+The following error handling mechanism is considered
+experimental and is subject to change pending feedback from
+users.
+
+=back
+
+If C or C encounter an error, a diagnostic
+message will be printed to C via C (for non-fatal
+errors), or via C (for fatal errors).
+
+If this behaviour is not desirable, the C attribute may be
+used to hold a reference to a variable, which will be used to store
+the diagnostics. The variable is made a reference to an array of hash
+references. Each hash contain a single key/value pair where the key
+is the name of the file, and the value is the error message (including
+the contents of C<$!> when appropriate). If a general error is
+encountered the diagnostic key will be empty.
+
+An example usage looks like:
+
+ remove_tree( 'foo/bar', 'bar/rat', {error => \my $err} );
+ if (@$err) {
+ for my $diag (@$err) {
+ my ($file, $message) = %$diag;
+ if ($file eq '') {
+ print "general error: $message\n";
+ }
+ else {
+ print "problem unlinking $file: $message\n";
+ }
+ }
+ }
+ else {
+ print "No error encountered\n";
+ }
+
+Note that if no errors are encountered, C<$err> will reference an
+empty array. This means that C<$err> will always end up TRUE; so you
+need to test C<@$err> to determine if errors occured.
+
+=head2 NOTES
+
+C blindly exports C and C into the
+current namespace. These days, this is considered bad style, but
+to change it now would break too much code. Nonetheless, you are
+invited to specify what it is you are expecting to use:
+
+ use File::Path 'rmtree';
+
+The routines C and C are B exported
+by default. You must specify which ones you want to use.
+
+ use File::Path 'remove_tree';
+
+Note that a side-effect of the above is that C and C
+are no longer exported at all. This is due to the way the C
+module works. If you are migrating a codebase to use the new
+interface, you will have to list everything explicitly. But that's
+just good practice anyway.
+
+ use File::Path qw(remove_tree rmtree);
+
+=head3 SECURITY CONSIDERATIONS
+
+There were race conditions 1.x implementations of File::Path's
+C function (although sometimes patched depending on the OS
+distribution or platform). The 2.0 version contains code to avoid the
+problem mentioned in CVE-2002-0435.
+
+See the following pages for more information:
+
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=286905
+ http://www.nntp.perl.org/group/perl.perl5.porters/2005/01/msg97623.html
+ http://www.debian.org/security/2005/dsa-696
+
+Additionally, unless the C parameter is set (or the
+third parameter in the traditional interface is TRUE), should a
+C be interrupted, files that were originally in read-only
+mode may now have their permissions set to a read-write (or "delete
+OK") mode.
+
+=head1 DIAGNOSTICS
+
+FATAL errors will cause the program to halt (C), since the
+problem is so severe that it would be dangerous to continue. (This
+can always be trapped with C, but it's not a good idea. Under
+the circumstances, dying is the best thing to do).
+
+SEVERE errors may be trapped using the modern interface. If the
+they are not trapped, or the old interface is used, such an error
+will cause the program will halt.
+
+All other errors may be trapped using the modern interface, otherwise
+they will be Ced about. Program execution will not be halted.
+
+=over 4
+
+=item mkdir [path]: [errmsg] (SEVERE)
+
+C was unable to create the path. Probably some sort of
+permissions error at the point of departure, or insufficient resources
+(such as free inodes on Unix).
+
+=item No root path(s) specified
+
+C was not given any paths to create. This message is only
+emitted if the routine is called with the traditional interface.
+The modern interface will remain silent if given nothing to do.
+
+=item No such file or directory
+
+On Windows, if C gives you this warning, it may mean that
+you have exceeded your filesystem's maximum path length.
+
+=item cannot fetch initial working directory: [errmsg]
+
+C attempted to determine the initial directory by calling
+C, but the call failed for some reason. No attempt
+will be made to delete anything.
+
+=item cannot stat initial working directory: [errmsg]
+
+C attempted to stat the initial directory (after having
+successfully obtained its name via C), however, the call
+failed for some reason. No attempt will be made to delete anything.
+
+=item cannot chdir to [dir]: [errmsg]
+
+C attempted to set the working directory in order to
+begin deleting the objects therein, but was unsuccessful. This is
+usually a permissions issue. The routine will continue to delete
+other things, but this directory will be left intact.
+
+=item directory [dir] changed before chdir, expected dev=[n] ino=[n], actual dev=[n] ino=[n], aborting. (FATAL)
+
+C recorded the device and inode of a directory, and then
+moved into it. It then performed a C on the current directory
+and detected that the device and inode were no longer the same. As
+this is at the heart of the race condition problem, the program
+will die at this point.
+
+=item cannot make directory [dir] read+writeable: [errmsg]
+
+C attempted to change the permissions on the current directory
+to ensure that subsequent unlinkings would not run into problems,
+but was unable to do so. The permissions remain as they were, and
+the program will carry on, doing the best it can.
+
+=item cannot read [dir]: [errmsg]
+
+C tried to read the contents of the directory in order
+to acquire the names of the directory entries to be unlinked, but
+was unsuccessful. This is usually a permissions issue. The
+program will continue, but the files in this directory will remain
+after the call.
+
+=item cannot reset chmod [dir]: [errmsg]
+
+C, after having deleted everything in a directory, attempted
+to restore its permissions to the original state but failed. The
+directory may wind up being left behind.
+
+=item cannot remove [dir] when cwd is [dir]
+
+The current working directory of the program is F
+and you are attempting to remove an ancestor, such as F.
+The directory tree is left untouched.
+
+The solution is to C out of the child directory to a place
+outside the directory tree to be removed.
+
+=item cannot chdir to [parent-dir] from [child-dir]: [errmsg], aborting. (FATAL)
+
+C, after having deleted everything and restored the permissions
+of a directory, was unable to chdir back to the parent. The program
+halts to avoid a race condition from occurring.
+
+=item cannot stat prior working directory [dir]: [errmsg], aborting. (FATAL)
+
+C was unable to stat the parent directory after have returned
+from the child. Since there is no way of knowing if we returned to
+where we think we should be (by comparing device and inode) the only
+way out is to C.
+
+=item previous directory [parent-dir] changed before entering [child-dir], expected dev=[n] ino=[n], actual dev=[n] ino=[n], aborting. (FATAL)
+
+When C returned from deleting files in a child directory, a
+check revealed that the parent directory it returned to wasn't the one
+it started out from. This is considered a sign of malicious activity.
+
+=item cannot make directory [dir] writeable: [errmsg]
+
+Just before removing a directory (after having successfully removed
+everything it contained), C attempted to set the permissions
+on the directory to ensure it could be removed and failed. Program
+execution continues, but the directory may possibly not be deleted.
+
+=item cannot remove directory [dir]: [errmsg]
+
+C attempted to remove a directory, but failed. This may because
+some objects that were unable to be removed remain in the directory, or
+a permissions issue. The directory will be left behind.
+
+=item cannot restore permissions of [dir] to [0nnn]: [errmsg]
+
+After having failed to remove a directory, C was unable to
+restore its permissions from a permissive state back to a possibly
+more restrictive setting. (Permissions given in octal).
+
+=item cannot make file [file] writeable: [errmsg]
+
+C attempted to force the permissions of a file to ensure it
+could be deleted, but failed to do so. It will, however, still attempt
+to unlink the file.
+
+=item cannot unlink file [file]: [errmsg]
+
+C failed to remove a file. Probably a permissions issue.
+
+=item cannot restore permissions of [file] to [0nnn]: [errmsg]
+
+After having failed to remove a file, C was also unable
+to restore the permissions on the file to a possibly less permissive
+setting. (Permissions given in octal).
+
+=back
+
+=head1 SEE ALSO
+
+=over 4
+
+=item *
+
+L
+
+Allows files and directories to be moved to the Trashcan/Recycle
+Bin (where they may later be restored if necessary) if the operating
+system supports such functionality. This feature may one day be
+made available directly in C.
+
+=item *
+
+L
+
+When removing directory trees, if you want to examine each file to
+decide whether to delete it (and possibly leaving large swathes
+alone), F offers a convenient and flexible approach
+to examining directory trees.
+
+=back
+
+=head1 BUGS
+
+Please report all bugs on the RT queue:
+
+L
+
+=head1 ACKNOWLEDGEMENTS
+
+Paul Szabo identified the race condition originally, and Brendan
+O'Dea wrote an implementation for Debian that addressed the problem.
+That code was used as a basis for the current code. Their efforts
+are greatly appreciated.
+
+Gisle Aas made a number of improvements to the documentation for
+2.07 and his advice and assistance is also greatly appreciated.
+
+=head1 AUTHORS
+
+Tim Bunce and Charles Bailey. Currently maintained by David Landgren
+>.
+
+=head1 COPYRIGHT
+
+This module is copyright (C) Charles Bailey, Tim Bunce and
+David Landgren 1995-2008. All rights reserved.
+
+=head1 LICENSE
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself.
+
+=cut
From noreply at svn.ci.uchicago.edu Tue Jul 20 02:51:34 2010
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Tue, 20 Jul 2010 02:51:34 -0500 (CDT)
Subject: [Swift-commit] r3449 - usertools/swift/swiftconfig/bin
Message-ID: <20100720075135.013B29CCC2@vm-125-59.ci.uchicago.edu>
Author: davidk
Date: 2010-07-20 02:51:34 -0500 (Tue, 20 Jul 2010)
New Revision: 3449
Modified:
usertools/swift/swiftconfig/bin/swiftconfig
usertools/swift/swiftconfig/bin/swiftrun
Log:
Switch from File::Path remove_tree to legacy rmtree to ensure it runs on sites with older perl installations (eg. bridled and login)
Modified: usertools/swift/swiftconfig/bin/swiftconfig
===================================================================
--- usertools/swift/swiftconfig/bin/swiftconfig 2010-07-20 07:36:24 UTC (rev 3448)
+++ usertools/swift/swiftconfig/bin/swiftconfig 2010-07-20 07:51:34 UTC (rev 3449)
@@ -3,7 +3,7 @@
use Cwd;
use Cwd qw(abs_path);
use File::Copy;
-use File::Path qw(remove_tree);
+use File::Path;
my $swifthome = '';
if ( $ENV{'SWIFT_HOME'} && -e "$ENV{'SWIFT_HOME'}/bin/swift" ) {
@@ -293,7 +293,7 @@
"Unable to find site entry for $remove\n";
}
- remove_tree("$dotswift/sites/$remove") || die "Unable to remove directory $dotswift/sites/$remove\n";
+ rmtree("$dotswift/sites/$remove") || die "Unable to remove directory $dotswift/sites/$remove\n";
}
# List all available templates
Modified: usertools/swift/swiftconfig/bin/swiftrun
===================================================================
--- usertools/swift/swiftconfig/bin/swiftrun 2010-07-20 07:36:24 UTC (rev 3448)
+++ usertools/swift/swiftconfig/bin/swiftrun 2010-07-20 07:51:34 UTC (rev 3449)
@@ -3,7 +3,7 @@
use Cwd;
use Cwd qw(abs_path);
use File::Copy;
-use File::Path qw(remove_tree);
+use File::Path;
my $swifthome = '';
if ( $ENV{'SWIFT_HOME'} && -e "$ENV{'SWIFT_HOME'}/bin/swift" ) {
@@ -107,11 +107,6 @@
}
}
-# Rename auths.default back to original
-if(-e "$ENV{'HOME'}/.ssh/auth.defaults.$datestring") {
- move("$ENV{'HOME'}/.ssh/auth.defaults.$datestring", "$ENV{'HOME'}/.ssh/auth.defaults") || die "Unable to rename $ENV{'HOME'}/.ssh/auth.defaults.$datestring";
-}
-
# Update XML tags
open(SITEFILE, "$dotswift/jobs/$script_filename/$datestring/sites.xml") || die "Unable to open $dotswift/jobs/$script_filename/$datestring/sites.xml\n";
my @sitedata = ;
@@ -125,3 +120,8 @@
print "Submitting job. Check $dotswift/jobs/$script_filename/$datestring for details\n";
system("swift -sites.file $dotswift/jobs/$script_filename/$datestring/sites.xml -tc.file $dotswift/jobs/$script_filename/$datestring/tc.data $script");
+# Rename auths.default back to original
+if(-e "$ENV{'HOME'}/.ssh/auth.defaults.$datestring") {
+ move("$ENV{'HOME'}/.ssh/auth.defaults.$datestring", "$ENV{'HOME'}/.ssh/auth.defaults") || die "Unable to rename $ENV{'HOME'}/.ssh/auth.defaults.$datestring";
+}
+
From noreply at svn.ci.uchicago.edu Wed Jul 21 16:22:09 2010
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Wed, 21 Jul 2010 16:22:09 -0500 (CDT)
Subject: [Swift-commit] r3450 - in branches/tests-01/tests: . html
Message-ID: <20100721212209.CAAA79CCCE@vm-125-59.ci.uchicago.edu>
Author: wozniak
Date: 2010-07-21 16:22:09 -0500 (Wed, 21 Jul 2010)
New Revision: 3450
Added:
branches/tests-01/tests/html/
branches/tests-01/tests/html/current.html
branches/tests-01/tests/html/header.html
Log:
New location for HTML fragments
Added: branches/tests-01/tests/html/current.html
===================================================================
--- branches/tests-01/tests/html/current.html (rev 0)
+++ branches/tests-01/tests/html/current.html 2010-07-21 21:22:09 UTC (rev 3450)
@@ -0,0 +1,14 @@
+
+
+ Redirecting...
+
+
+
+
+ You should be redirected to _HTMLBASE_
+
+
Added: branches/tests-01/tests/html/header.html
===================================================================
--- branches/tests-01/tests/html/header.html (rev 0)
+++ branches/tests-01/tests/html/header.html 2010-07-21 21:22:09 UTC (rev 3450)
@@ -0,0 +1,31 @@
+
+
+ Swift nightly integration tests and build (_DATE_ _TIME_)
+
+
+
+
+ Swift nightly integration tests and build
+
+ - Date: _DATE_
+ - Time: _TIME_
+ - Test host: _HOST_
+
+
+ - Test results
+
- Compiled packages
+
- Older tests
+
- How to add new tests
+
+
From noreply at svn.ci.uchicago.edu Wed Jul 21 16:22:39 2010
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Wed, 21 Jul 2010 16:22:39 -0500 (CDT)
Subject: [Swift-commit] r3451 - branches/tests-01/examples
Message-ID: <20100721212239.38D3B9CCCE@vm-125-59.ci.uchicago.edu>
Author: wozniak
Date: 2010-07-21 16:22:39 -0500 (Wed, 21 Jul 2010)
New Revision: 3451
Added:
branches/tests-01/examples/array_index.swift
branches/tests-01/examples/array_iteration.swift
branches/tests-01/examples/array_wildcard.swift
branches/tests-01/examples/arraymapper.swift
branches/tests-01/examples/default.swift
Removed:
branches/tests-01/examples/array_index.dtm
branches/tests-01/examples/array_iteration.dtm
branches/tests-01/examples/array_wildcard.dtm
branches/tests-01/examples/arraymapper.dtm
branches/tests-01/examples/default.dtm
Log:
Move *.dtm -> *.swift
Deleted: branches/tests-01/examples/array_index.dtm
===================================================================
--- branches/tests-01/examples/array_index.dtm 2010-07-21 21:22:09 UTC (rev 3450)
+++ branches/tests-01/examples/array_index.dtm 2010-07-21 21:22:39 UTC (rev 3451)
@@ -1,13 +0,0 @@
-type file {}
-
-
-(file t) echo_array (string s[]) {
- app {
- echo s[0] s[1] s[2] stdout=@filename(t);
- }
-}
-
-string greetings[] = ["how","are","you"];
-file hw = echo_array(greetings);
-
-
Copied: branches/tests-01/examples/array_index.swift (from rev 3445, branches/tests-01/examples/array_index.dtm)
===================================================================
--- branches/tests-01/examples/array_index.swift (rev 0)
+++ branches/tests-01/examples/array_index.swift 2010-07-21 21:22:39 UTC (rev 3451)
@@ -0,0 +1,13 @@
+type file {}
+
+
+(file t) echo_array (string s[]) {
+ app {
+ echo s[0] s[1] s[2] stdout=@filename(t);
+ }
+}
+
+string greetings[] = ["how","are","you"];
+file hw = echo_array(greetings);
+
+
Deleted: branches/tests-01/examples/array_iteration.dtm
===================================================================
--- branches/tests-01/examples/array_iteration.dtm 2010-07-21 21:22:09 UTC (rev 3450)
+++ branches/tests-01/examples/array_iteration.dtm 2010-07-21 21:22:39 UTC (rev 3451)
@@ -1,17 +0,0 @@
-type file {}
-
-(file f) echo (string s) {
- app {
- echo s stdout=@filename(f);
- }
-}
-
-(file fa[]) echo_batch (string sa[]) {
- foreach string s, i in sa {
- fa[i] = echo(s);
- }
-}
-
-string sa[] = ["hello","hi there","how are you"];
-file fa[];
-fa = echo_batch(sa);
Copied: branches/tests-01/examples/array_iteration.swift (from rev 3445, branches/tests-01/examples/array_iteration.dtm)
===================================================================
--- branches/tests-01/examples/array_iteration.swift (rev 0)
+++ branches/tests-01/examples/array_iteration.swift 2010-07-21 21:22:39 UTC (rev 3451)
@@ -0,0 +1,17 @@
+type file {}
+
+(file f) echo (string s) {
+ app {
+ echo s stdout=@filename(f);
+ }
+}
+
+(file fa[]) echo_batch (string sa[]) {
+ foreach string s, i in sa {
+ fa[i] = echo(s);
+ }
+}
+
+string sa[] = ["hello","hi there","how are you"];
+file fa[];
+fa = echo_batch(sa);
Deleted: branches/tests-01/examples/array_wildcard.dtm
===================================================================
--- branches/tests-01/examples/array_wildcard.dtm 2010-07-21 21:22:09 UTC (rev 3450)
+++ branches/tests-01/examples/array_wildcard.dtm 2010-07-21 21:22:39 UTC (rev 3451)
@@ -1,13 +0,0 @@
-type file {}
-
-
-(file t) echo_wildcard (string s[]) {
- app {
- echo s[*] stdout=@filename(t);
- }
-}
-
-string greetings[] = ["how","are","you"];
-file hw = echo_wildcard(greetings);
-
-
Copied: branches/tests-01/examples/array_wildcard.swift (from rev 3445, branches/tests-01/examples/array_wildcard.dtm)
===================================================================
--- branches/tests-01/examples/array_wildcard.swift (rev 0)
+++ branches/tests-01/examples/array_wildcard.swift 2010-07-21 21:22:39 UTC (rev 3451)
@@ -0,0 +1,13 @@
+type file {}
+
+
+(file t) echo_wildcard (string s[]) {
+ app {
+ echo s[*] stdout=@filename(t);
+ }
+}
+
+string greetings[] = ["how","are","you"];
+file hw = echo_wildcard(greetings);
+
+
Deleted: branches/tests-01/examples/arraymapper.dtm
===================================================================
--- branches/tests-01/examples/arraymapper.dtm 2010-07-21 21:22:09 UTC (rev 3450)
+++ branches/tests-01/examples/arraymapper.dtm 2010-07-21 21:22:39 UTC (rev 3451)
@@ -1,8 +0,0 @@
-type file {};
-
-file files[];
-
-foreach f in files {
- print(f);
-}
-
Copied: branches/tests-01/examples/arraymapper.swift (from rev 3445, branches/tests-01/examples/arraymapper.dtm)
===================================================================
--- branches/tests-01/examples/arraymapper.swift (rev 0)
+++ branches/tests-01/examples/arraymapper.swift 2010-07-21 21:22:39 UTC (rev 3451)
@@ -0,0 +1,8 @@
+type file {};
+
+file files[];
+
+foreach f in files {
+ print(f);
+}
+
Deleted: branches/tests-01/examples/default.dtm
===================================================================
--- branches/tests-01/examples/default.dtm 2010-07-21 21:22:09 UTC (rev 3450)
+++ branches/tests-01/examples/default.dtm 2010-07-21 21:22:39 UTC (rev 3451)
@@ -1,11 +0,0 @@
-type file {}
-
-(file t) echo (string s="hello world") { //s has a default value
- app {
- echo s stdout=@filename(t); //redirect stdout to a file
- }
-}
-
-file hw1, hw2;
-hw1 = echo(); // procedure call using the default value
-hw2 = echo(s="hello again"); // using a different value
Copied: branches/tests-01/examples/default.swift (from rev 3445, branches/tests-01/examples/default.dtm)
===================================================================
--- branches/tests-01/examples/default.swift (rev 0)
+++ branches/tests-01/examples/default.swift 2010-07-21 21:22:39 UTC (rev 3451)
@@ -0,0 +1,11 @@
+type file {}
+
+(file t) echo (string s="hello world") { //s has a default value
+ app {
+ echo s stdout=@filename(t); //redirect stdout to a file
+ }
+}
+
+file hw1, hw2;
+hw1 = echo(); // procedure call using the default value
+hw2 = echo(s="hello again"); // using a different value
From noreply at svn.ci.uchicago.edu Wed Jul 21 16:23:03 2010
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Wed, 21 Jul 2010 16:23:03 -0500 (CDT)
Subject: [Swift-commit] r3452 - branches/tests-01/tests
Message-ID: <20100721212303.DEDB69CCCE@vm-125-59.ci.uchicago.edu>
Author: wozniak
Date: 2010-07-21 16:23:03 -0500 (Wed, 21 Jul 2010)
New Revision: 3452
Modified:
branches/tests-01/tests/array_iteration.swift
Log:
Small fix to test
Modified: branches/tests-01/tests/array_iteration.swift
===================================================================
--- branches/tests-01/tests/array_iteration.swift 2010-07-21 21:22:39 UTC (rev 3451)
+++ branches/tests-01/tests/array_iteration.swift 2010-07-21 21:23:03 UTC (rev 3452)
@@ -1,13 +1,11 @@
type file {}
-(file f) echo (string s) {
- app {
+app (file f) echo (string s) {
echo s stdout=@filename(f);
- }
}
(file fa[]) echo_batch (string sa[]) {
- foreach string s, i in sa {
+ foreach s, i in sa {
fa[i] = echo(s);
}
}
From noreply at svn.ci.uchicago.edu Wed Jul 21 16:25:39 2010
From: noreply at svn.ci.uchicago.edu (noreply at svn.ci.uchicago.edu)
Date: Wed, 21 Jul 2010 16:25:39 -0500 (CDT)
Subject: [Swift-commit] r3453 - branches/tests-01/tests
Message-ID: <20100721212539.24DAF9CCCE@vm-125-59.ci.uchicago.edu>
Author: wozniak
Date: 2010-07-21 16:25:38 -0500 (Wed, 21 Jul 2010)
New Revision: 3453
Modified:
branches/tests-01/tests/nightly.sh
Log:
Modifications to nightly.sh
Modified: branches/tests-01/tests/nightly.sh
===================================================================
--- branches/tests-01/tests/nightly.sh 2010-07-21 21:23:03 UTC (rev 3452)
+++ branches/tests-01/tests/nightly.sh 2010-07-21 21:25:38 UTC (rev 3453)
@@ -1,85 +1,95 @@
#!/bin/bash
-OUTDIR=$PWD
-LOGCOUNT=0
-SEQ=1
-DATE=`date +"%Y-%m-%d"`
-TIME=`date +"%T %Z(%z)"`
-RUNDIRBASE="run-$DATE"
-RUNDIR=$OUTDIR/$RUNDIRBASE
-mkdir -p $RUNDIR
+# set -x
-OUTBASE=$RUNDIRBASE/tests.log
+# USAGE NOTES:
+# Run nightly.sh -h for quick help
+# When something goes wrong, find and check tests.log
+# Code is checked out into TOPDIR
+# Swift is installed in its source tree
+# The run is executed in RUNDIR (TOPDIR/RUNDIRBASE)
+# The build test is started in TOPDIR
+# Everything for a Swift test is written in its RUNDIR
+# The temporary output always goes to OUTPUT (TOPDIR/exec.out)
-BRANCH="branches/tests-01"
+printhelp() {
+ echo "nightly.sh
|
|---|
"
if [ "$BINPACKAGE" != "" ]; then
- FBP=$OUTDIR/$BINPACKAGE
+ FBP=$RUNDIR/$BINPACKAGE
SIZE=`ls -hs $FBP`
SIZE=${SIZE/$FBP}
cat <