[Swift-commit] r5505 - in branches/release-0.93.1: . bin docs docs/cookbook docs/cookbook/.cache docs/documentation docs/documentation/.cache docs/quickstart docs/quickstart/.cache docs/siteguide docs/siteguide/.cache docs/tutorial docs/tutorial/.cache docs/userguide docs/userguide/.cache docs/utils docs/utils/.cache etc etc/sites examples/misc libexec libexec/log-processing resources src/org/griphyn/vdl/engine src/org/griphyn/vdl/karajan src/org/griphyn/vdl/karajan/lib src/org/griphyn/vdl/karajan/lib/swiftscript src/org/griphyn/vdl/mapping tests tests/cdm tests/cdm/absolute tests/cdm/absolute/indir tests/functions tests/groups tests/sites tests/sites/PADS tests/sites/PADS/coasters tests/sites/PADS/pbs tests/sites/beagle tests/sites/beagle/coasters tests/sites/beagle/pbs tests/sites/crow tests/sites/crow/big tests/sites/fusion tests/sites/ibicluster tests/sites/intrepid tests/sites/local tests/sites/local-coasters tests/sites/mcs tests/sites/queenbee tests/sites/queenbee/pbs tests/ sites/ranger tests/sites/ranger/gt2 tests/sites/ranger/local tests/sites/surveyor tests/sites.old tests/sites.old/broken tests/sites.old/coaster tests/sites.old/communicado.ci.uchicago.edu tests/sites.old/gwynn.bsd.uchicago.edu tests/sites.old/tg-login.uc.teragrid.org tests/sites.old/wonky
hategan at ci.uchicago.edu
hategan at ci.uchicago.edu
Sat Jan 21 21:23:23 CST 2012
Author: hategan
Date: 2012-01-21 21:23:13 -0600 (Sat, 21 Jan 2012)
New Revision: 5505
Added:
branches/release-0.93.1/docs/cookbook/.cache/
branches/release-0.93.1/docs/cookbook/.cache/cookbook.txt
branches/release-0.93.1/docs/documentation/.cache/
branches/release-0.93.1/docs/documentation/.cache/documentation.txt
branches/release-0.93.1/docs/quickstart/.cache/
branches/release-0.93.1/docs/quickstart/.cache/quickstart.txt
branches/release-0.93.1/docs/siteguide/.cache/
branches/release-0.93.1/docs/siteguide/.cache/siteguide.txt
branches/release-0.93.1/docs/siteguide/bag_of_workstations
branches/release-0.93.1/docs/siteguide/mcs
branches/release-0.93.1/docs/tutorial/.cache/
branches/release-0.93.1/docs/tutorial/.cache/tutorial.txt
branches/release-0.93.1/docs/userguide/.cache/
branches/release-0.93.1/docs/userguide/.cache/userguide.txt
branches/release-0.93.1/docs/userguide/troubleshooting
branches/release-0.93.1/docs/utils/.cache/
branches/release-0.93.1/docs/utils/.cache/gensites.txt
branches/release-0.93.1/etc/sites/mcs
branches/release-0.93.1/examples/misc/data.txt
branches/release-0.93.1/tests/cdm/absolute/
branches/release-0.93.1/tests/cdm/absolute/100-infullpath-outfullpath.check.sh
branches/release-0.93.1/tests/cdm/absolute/100-infullpath-outfullpath.swift
branches/release-0.93.1/tests/cdm/absolute/200-infullpath-outrelpath.check.sh
branches/release-0.93.1/tests/cdm/absolute/200-infullpath-outrelpath.swift
branches/release-0.93.1/tests/cdm/absolute/300-inrelpath-outfullpath.check.sh
branches/release-0.93.1/tests/cdm/absolute/300-inrelpath-outfullpath.swift
branches/release-0.93.1/tests/cdm/absolute/400-inrelpath-outrelpath.check.sh
branches/release-0.93.1/tests/cdm/absolute/400-inrelpath-outrelpath.swift
branches/release-0.93.1/tests/cdm/absolute/README
branches/release-0.93.1/tests/cdm/absolute/basic.swift
branches/release-0.93.1/tests/cdm/absolute/catnap.sh
branches/release-0.93.1/tests/cdm/absolute/cf.absolute
branches/release-0.93.1/tests/cdm/absolute/cf.relative
branches/release-0.93.1/tests/cdm/absolute/clean.sh
branches/release-0.93.1/tests/cdm/absolute/data1.txt
branches/release-0.93.1/tests/cdm/absolute/data2.txt
branches/release-0.93.1/tests/cdm/absolute/data3.txt
branches/release-0.93.1/tests/cdm/absolute/data4.txt
branches/release-0.93.1/tests/cdm/absolute/ff.kml
branches/release-0.93.1/tests/cdm/absolute/ff.swift
branches/release-0.93.1/tests/cdm/absolute/fr.kml
branches/release-0.93.1/tests/cdm/absolute/fr.swift
branches/release-0.93.1/tests/cdm/absolute/fs.data
branches/release-0.93.1/tests/cdm/absolute/indir/
branches/release-0.93.1/tests/cdm/absolute/indir/data1.txt
branches/release-0.93.1/tests/cdm/absolute/indir/data2.txt
branches/release-0.93.1/tests/cdm/absolute/indir/data3.txt
branches/release-0.93.1/tests/cdm/absolute/indir/data4.txt
branches/release-0.93.1/tests/cdm/absolute/out1.data
branches/release-0.93.1/tests/cdm/absolute/out2.data
branches/release-0.93.1/tests/cdm/absolute/out3.data
branches/release-0.93.1/tests/cdm/absolute/out4.data
branches/release-0.93.1/tests/cdm/absolute/rf.kml
branches/release-0.93.1/tests/cdm/absolute/rf.swift
branches/release-0.93.1/tests/cdm/absolute/rr.kml
branches/release-0.93.1/tests/cdm/absolute/rr.swift
branches/release-0.93.1/tests/cdm/absolute/run.sh
branches/release-0.93.1/tests/cdm/absolute/set-env.sh
branches/release-0.93.1/tests/cdm/absolute/setup.sh
branches/release-0.93.1/tests/cdm/absolute/sites.xml
branches/release-0.93.1/tests/cdm/absolute/tc
branches/release-0.93.1/tests/functions/501-filenames.check.sh
branches/release-0.93.1/tests/functions/501-filenames.out.expected
branches/release-0.93.1/tests/functions/501-filenames.setup.sh
branches/release-0.93.1/tests/functions/501-filenames.swift
branches/release-0.93.1/tests/sites.old/
branches/release-0.93.1/tests/sites.old/README
branches/release-0.93.1/tests/sites.old/UCLA_Saxon_Tier3-fork.xml
branches/release-0.93.1/tests/sites.old/broken/
branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-b2-condor.xml
branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-b2-fork.xml
branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-condor.xml
branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-fork.xml
branches/release-0.93.1/tests/sites.old/broken/tp-pbs-gram4.xml
branches/release-0.93.1/tests/sites.old/coaster/
branches/release-0.93.1/tests/sites.old/coaster/coaster-local.xml
branches/release-0.93.1/tests/sites.old/coaster/fletch-coaster-gram2-gram2-condor.xml
branches/release-0.93.1/tests/sites.old/coaster/fletch-coaster-gram2-gram2-fork.xml
branches/release-0.93.1/tests/sites.old/coaster/renci-engage-coaster.xml
branches/release-0.93.1/tests/sites.old/coaster/teraport-gt2-gt2-pbs.xml
branches/release-0.93.1/tests/sites.old/coaster/tgncsa-hg-coaster-pbs-gram2.xml
branches/release-0.93.1/tests/sites.old/coaster/tgncsa-hg-coaster-pbs-gram4.xml
branches/release-0.93.1/tests/sites.old/coaster/uj-pbs-gram2.xml
branches/release-0.93.1/tests/sites.old/communicado.ci.uchicago.edu/
branches/release-0.93.1/tests/sites.old/communicado.ci.uchicago.edu/local-condor.xml
branches/release-0.93.1/tests/sites.old/fletch-condor-gram2.xml
branches/release-0.93.1/tests/sites.old/fletch-fork-gram2.xml
branches/release-0.93.1/tests/sites.old/gwynn.bsd.uchicago.edu/
branches/release-0.93.1/tests/sites.old/gwynn.bsd.uchicago.edu/condor-provider.xml
branches/release-0.93.1/tests/sites.old/local-wrapper-args-file.xml
branches/release-0.93.1/tests/sites.old/localhost.xml
branches/release-0.93.1/tests/sites.old/osg-edu.cs.wisc.edu-condor.xml
branches/release-0.93.1/tests/sites.old/osg-edu.cs.wisc.edu-fork.xml
branches/release-0.93.1/tests/sites.old/pads-pbs-coasters.sh
branches/release-0.93.1/tests/sites.old/renci-engage-condor.xml
branches/release-0.93.1/tests/sites.old/run-all
branches/release-0.93.1/tests/sites.old/run-site
branches/release-0.93.1/tests/sites.old/tc.data
branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/
branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-fork-gram2.xml
branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-fork-gram4.xml
branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-gram2.xml
branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-gram4.xml
branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-local.xml
branches/release-0.93.1/tests/sites.old/tgncsa-hg-fork-gram2.xml
branches/release-0.93.1/tests/sites.old/tgncsa-hg-fork-gram4.xml
branches/release-0.93.1/tests/sites.old/tgncsa-hg-pbs-gram2.xml
branches/release-0.93.1/tests/sites.old/tgncsa-hg-pbs-gram4.xml
branches/release-0.93.1/tests/sites.old/tgpurdue-condor-gram2.xml
branches/release-0.93.1/tests/sites.old/tgpurdue-condor-gram4.xml
branches/release-0.93.1/tests/sites.old/tgpurdue-fork-gram2.xml
branches/release-0.93.1/tests/sites.old/tgpurdue-fork-gram4.xml
branches/release-0.93.1/tests/sites.old/tgtacc-fork-gram2.xml
branches/release-0.93.1/tests/sites.old/tgtacc-lsf-gram2.xml
branches/release-0.93.1/tests/sites.old/tguc-fork-gram2.xml
branches/release-0.93.1/tests/sites.old/tguc-fork-gram4.xml
branches/release-0.93.1/tests/sites.old/tguc-pbs-gram2-syntax1.xml
branches/release-0.93.1/tests/sites.old/tguc-pbs-gram2.xml
branches/release-0.93.1/tests/sites.old/tguc-pbs-gram4.xml
branches/release-0.93.1/tests/sites.old/tp-fork-gram2.xml
branches/release-0.93.1/tests/sites.old/tp-fork-gram4.xml
branches/release-0.93.1/tests/sites.old/tp-pbs-gram2.xml
branches/release-0.93.1/tests/sites.old/uj-fork-gram2.xml
branches/release-0.93.1/tests/sites.old/uj-pbs-gram2.xml
branches/release-0.93.1/tests/sites.old/wonky/
branches/release-0.93.1/tests/sites.old/wonky/relative-absolute-wrapper.xml
branches/release-0.93.1/tests/sites.old/wonky/slow-queue-fast-queue.xml
branches/release-0.93.1/tests/sites.old/wonky/wonky-80percent.xml
branches/release-0.93.1/tests/sites.old/wonky/wonky-90percent.xml
branches/release-0.93.1/tests/sites.old/wonky/wonky-failfirst.xml
branches/release-0.93.1/tests/sites.old/wonky/wonky-good.xml
branches/release-0.93.1/tests/sites.old/wonky/wonky-runawayjob.xml
branches/release-0.93.1/tests/sites.old/wonky/wrongdir.xml
branches/release-0.93.1/tests/sites/
branches/release-0.93.1/tests/sites/PADS/
branches/release-0.93.1/tests/sites/PADS/coasters/
branches/release-0.93.1/tests/sites/PADS/coasters/README
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.setup.sh
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.swift
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.timeout
branches/release-0.93.1/tests/sites/PADS/coasters/data.txt
branches/release-0.93.1/tests/sites/PADS/coasters/sites.template.xml
branches/release-0.93.1/tests/sites/PADS/coasters/tc.template.data
branches/release-0.93.1/tests/sites/PADS/pbs/
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.setup.sh
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.swift
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.timeout
branches/release-0.93.1/tests/sites/PADS/pbs/data.txt
branches/release-0.93.1/tests/sites/PADS/pbs/sites.template.xml
branches/release-0.93.1/tests/sites/PADS/pbs/tc.template.data
branches/release-0.93.1/tests/sites/beagle/
branches/release-0.93.1/tests/sites/beagle/coasters/
branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.check.sh
branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.setup.sh
branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.swift
branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.timeout
branches/release-0.93.1/tests/sites/beagle/coasters/data.txt
branches/release-0.93.1/tests/sites/beagle/coasters/sites.template.xml
branches/release-0.93.1/tests/sites/beagle/coasters/tc.template.data
branches/release-0.93.1/tests/sites/beagle/coasters/title.txt
branches/release-0.93.1/tests/sites/beagle/pbs/
branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.check.sh
branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.setup.sh
branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.swift
branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.timeout
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/data.txt
branches/release-0.93.1/tests/sites/beagle/pbs/sites.template.xml
branches/release-0.93.1/tests/sites/beagle/pbs/tc.template.data
branches/release-0.93.1/tests/sites/crow/
branches/release-0.93.1/tests/sites/crow/001-catsn.check.sh
branches/release-0.93.1/tests/sites/crow/001-catsn.clean.sh
branches/release-0.93.1/tests/sites/crow/001-catsn.setup.sh
branches/release-0.93.1/tests/sites/crow/001-catsn.swift
branches/release-0.93.1/tests/sites/crow/001-catsn.timeout
branches/release-0.93.1/tests/sites/crow/big/
branches/release-0.93.1/tests/sites/crow/big/201-cps.check.sh
branches/release-0.93.1/tests/sites/crow/big/201-cps.clean.sh
branches/release-0.93.1/tests/sites/crow/big/201-cps.setup.sh
branches/release-0.93.1/tests/sites/crow/big/201-cps.swift
branches/release-0.93.1/tests/sites/crow/big/201-cps.timeout
branches/release-0.93.1/tests/sites/crow/big/cps.sh
branches/release-0.93.1/tests/sites/crow/big/data.txt
branches/release-0.93.1/tests/sites/crow/big/sites.template.xml
branches/release-0.93.1/tests/sites/crow/big/title.txt
branches/release-0.93.1/tests/sites/crow/data.txt
branches/release-0.93.1/tests/sites/crow/sites.template.xml
branches/release-0.93.1/tests/sites/crow/tc.template.data
branches/release-0.93.1/tests/sites/crow/title.txt
branches/release-0.93.1/tests/sites/fusion/
branches/release-0.93.1/tests/sites/fusion/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.setup.sh
branches/release-0.93.1/tests/sites/fusion/catsn.swift
branches/release-0.93.1/tests/sites/fusion/catsn.timeout
branches/release-0.93.1/tests/sites/fusion/data.txt
branches/release-0.93.1/tests/sites/fusion/sites.template.xml
branches/release-0.93.1/tests/sites/fusion/tc.template.data
branches/release-0.93.1/tests/sites/ibicluster/
branches/release-0.93.1/tests/sites/ibicluster/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.check.sh
branches/release-0.93.1/tests/sites/ibicluster/catsn.setup.sh
branches/release-0.93.1/tests/sites/ibicluster/catsn.swift
branches/release-0.93.1/tests/sites/ibicluster/catsn.timeout
branches/release-0.93.1/tests/sites/ibicluster/data.txt
branches/release-0.93.1/tests/sites/ibicluster/sites.template.xml
branches/release-0.93.1/tests/sites/ibicluster/tc.template.data
branches/release-0.93.1/tests/sites/ibicluster/title.txt
branches/release-0.93.1/tests/sites/intrepid/
branches/release-0.93.1/tests/sites/intrepid/100-cp.check.sh
branches/release-0.93.1/tests/sites/intrepid/100-cp.clean.sh
branches/release-0.93.1/tests/sites/intrepid/100-cp.setup.sh
branches/release-0.93.1/tests/sites/intrepid/100-cp.swift
branches/release-0.93.1/tests/sites/intrepid/100-cp.timeout
branches/release-0.93.1/tests/sites/intrepid/sites.template.xml
branches/release-0.93.1/tests/sites/intrepid/tc.template.data
branches/release-0.93.1/tests/sites/intrepid/title.txt
branches/release-0.93.1/tests/sites/local-coasters/
branches/release-0.93.1/tests/sites/local-coasters/200-cp.check.sh
branches/release-0.93.1/tests/sites/local-coasters/200-cp.clean.sh
branches/release-0.93.1/tests/sites/local-coasters/200-cp.setup.sh
branches/release-0.93.1/tests/sites/local-coasters/200-cp.swift
branches/release-0.93.1/tests/sites/local-coasters/201-cp.check.sh
branches/release-0.93.1/tests/sites/local-coasters/201-cp.clean.sh
branches/release-0.93.1/tests/sites/local-coasters/201-cp.setup.sh
branches/release-0.93.1/tests/sites/local-coasters/201-cp.swift
branches/release-0.93.1/tests/sites/local-coasters/README.txt
branches/release-0.93.1/tests/sites/local-coasters/sites.template.xml
branches/release-0.93.1/tests/sites/local-coasters/tc.template.data
branches/release-0.93.1/tests/sites/local-coasters/title.txt
branches/release-0.93.1/tests/sites/local/
branches/release-0.93.1/tests/sites/local/001-catsn-local.check.sh
branches/release-0.93.1/tests/sites/local/001-catsn-local.setup.sh
branches/release-0.93.1/tests/sites/local/001-catsn-local.swift
branches/release-0.93.1/tests/sites/local/001-catsn-local.timeout
branches/release-0.93.1/tests/sites/local/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/local/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/local/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/local/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/local/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/local/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/local/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/local/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/local/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/local/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/local/data.txt
branches/release-0.93.1/tests/sites/local/sites.template.xml
branches/release-0.93.1/tests/sites/local/tc.template.data
branches/release-0.93.1/tests/sites/local/title.txt
branches/release-0.93.1/tests/sites/mcs/
branches/release-0.93.1/tests/sites/mcs/001-catsn.check.sh
branches/release-0.93.1/tests/sites/mcs/001-catsn.clean.sh
branches/release-0.93.1/tests/sites/mcs/001-catsn.setup.sh
branches/release-0.93.1/tests/sites/mcs/001-catsn.swift
branches/release-0.93.1/tests/sites/mcs/001-catsn.timeout
branches/release-0.93.1/tests/sites/mcs/README
branches/release-0.93.1/tests/sites/mcs/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/mcs/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/mcs/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/mcs/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/mcs/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/mcs/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/mcs/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/mcs/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/mcs/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/mcs/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/mcs/coaster-service.conf
branches/release-0.93.1/tests/sites/mcs/data.txt
branches/release-0.93.1/tests/sites/mcs/title.txt
branches/release-0.93.1/tests/sites/queenbee/
branches/release-0.93.1/tests/sites/queenbee/pbs/
branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.check.sh
branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.swift
branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.timeout
branches/release-0.93.1/tests/sites/queenbee/pbs/README
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/data.txt
branches/release-0.93.1/tests/sites/queenbee/pbs/sites.template.xml
branches/release-0.93.1/tests/sites/queenbee/pbs/tc.template.data
branches/release-0.93.1/tests/sites/queenbee/pbs/title.txt
branches/release-0.93.1/tests/sites/ranger/
branches/release-0.93.1/tests/sites/ranger/gt2/
branches/release-0.93.1/tests/sites/ranger/gt2/001-catsn-ranger.swift
branches/release-0.93.1/tests/sites/ranger/gt2/cf
branches/release-0.93.1/tests/sites/ranger/gt2/data.txt
branches/release-0.93.1/tests/sites/ranger/gt2/sites.template.xml
branches/release-0.93.1/tests/sites/ranger/gt2/start_proxy.sh
branches/release-0.93.1/tests/sites/ranger/gt2/tc.template.data
branches/release-0.93.1/tests/sites/ranger/local/
branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.check.sh
branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.setup.sh
branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.swift
branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.timeout
branches/release-0.93.1/tests/sites/ranger/local/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/ranger/local/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/ranger/local/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/ranger/local/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/ranger/local/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/ranger/local/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/ranger/local/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/ranger/local/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/ranger/local/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/ranger/local/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/ranger/local/data.txt
branches/release-0.93.1/tests/sites/ranger/local/sites.template.xml
branches/release-0.93.1/tests/sites/ranger/local/sleep.swift
branches/release-0.93.1/tests/sites/ranger/local/tc.template.data
branches/release-0.93.1/tests/sites/ranger/local/title.txt
branches/release-0.93.1/tests/sites/surveyor/
branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.check.sh
branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.setup.sh
branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.swift
branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.timeout
branches/release-0.93.1/tests/sites/surveyor/README
branches/release-0.93.1/tests/sites/surveyor/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/surveyor/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/surveyor/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/surveyor/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/surveyor/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/surveyor/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/surveyor/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/surveyor/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/surveyor/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/surveyor/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/surveyor/data.txt
branches/release-0.93.1/tests/sites/surveyor/sites.template.xml
branches/release-0.93.1/tests/sites/surveyor/tc.template.data
branches/release-0.93.1/tests/sites/surveyor/title.txt
Removed:
branches/release-0.93.1/docs/cookbook/.cache/cookbook.txt
branches/release-0.93.1/docs/documentation/.cache/documentation.txt
branches/release-0.93.1/docs/quickstart/.cache/quickstart.txt
branches/release-0.93.1/docs/siteguide/.cache/siteguide.txt
branches/release-0.93.1/docs/tutorial/.cache/tutorial.txt
branches/release-0.93.1/docs/userguide/.cache/userguide.txt
branches/release-0.93.1/docs/utils/.cache/gensites.txt
branches/release-0.93.1/etc/sites/OLD/
branches/release-0.93.1/tests/cdm/absolute/100-infullpath-outfullpath.check.sh
branches/release-0.93.1/tests/cdm/absolute/100-infullpath-outfullpath.swift
branches/release-0.93.1/tests/cdm/absolute/200-infullpath-outrelpath.check.sh
branches/release-0.93.1/tests/cdm/absolute/200-infullpath-outrelpath.swift
branches/release-0.93.1/tests/cdm/absolute/300-inrelpath-outfullpath.check.sh
branches/release-0.93.1/tests/cdm/absolute/300-inrelpath-outfullpath.swift
branches/release-0.93.1/tests/cdm/absolute/400-inrelpath-outrelpath.check.sh
branches/release-0.93.1/tests/cdm/absolute/400-inrelpath-outrelpath.swift
branches/release-0.93.1/tests/cdm/absolute/README
branches/release-0.93.1/tests/cdm/absolute/basic.swift
branches/release-0.93.1/tests/cdm/absolute/catnap.sh
branches/release-0.93.1/tests/cdm/absolute/cf.absolute
branches/release-0.93.1/tests/cdm/absolute/cf.relative
branches/release-0.93.1/tests/cdm/absolute/clean.sh
branches/release-0.93.1/tests/cdm/absolute/data1.txt
branches/release-0.93.1/tests/cdm/absolute/data2.txt
branches/release-0.93.1/tests/cdm/absolute/data3.txt
branches/release-0.93.1/tests/cdm/absolute/data4.txt
branches/release-0.93.1/tests/cdm/absolute/ff.kml
branches/release-0.93.1/tests/cdm/absolute/ff.swift
branches/release-0.93.1/tests/cdm/absolute/fr.kml
branches/release-0.93.1/tests/cdm/absolute/fr.swift
branches/release-0.93.1/tests/cdm/absolute/fs.data
branches/release-0.93.1/tests/cdm/absolute/indir/
branches/release-0.93.1/tests/cdm/absolute/indir/data1.txt
branches/release-0.93.1/tests/cdm/absolute/indir/data2.txt
branches/release-0.93.1/tests/cdm/absolute/indir/data3.txt
branches/release-0.93.1/tests/cdm/absolute/indir/data4.txt
branches/release-0.93.1/tests/cdm/absolute/out1.data
branches/release-0.93.1/tests/cdm/absolute/out2.data
branches/release-0.93.1/tests/cdm/absolute/out3.data
branches/release-0.93.1/tests/cdm/absolute/out4.data
branches/release-0.93.1/tests/cdm/absolute/rf.kml
branches/release-0.93.1/tests/cdm/absolute/rf.swift
branches/release-0.93.1/tests/cdm/absolute/rr.kml
branches/release-0.93.1/tests/cdm/absolute/rr.swift
branches/release-0.93.1/tests/cdm/absolute/run.sh
branches/release-0.93.1/tests/cdm/absolute/set-env.sh
branches/release-0.93.1/tests/cdm/absolute/setup.sh
branches/release-0.93.1/tests/cdm/absolute/sites.xml
branches/release-0.93.1/tests/cdm/absolute/tc
branches/release-0.93.1/tests/providers/
branches/release-0.93.1/tests/sites.old/README
branches/release-0.93.1/tests/sites.old/UCLA_Saxon_Tier3-fork.xml
branches/release-0.93.1/tests/sites.old/broken/
branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-b2-condor.xml
branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-b2-fork.xml
branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-condor.xml
branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-fork.xml
branches/release-0.93.1/tests/sites.old/broken/tp-pbs-gram4.xml
branches/release-0.93.1/tests/sites.old/coaster/
branches/release-0.93.1/tests/sites.old/coaster/coaster-local.xml
branches/release-0.93.1/tests/sites.old/coaster/fletch-coaster-gram2-gram2-condor.xml
branches/release-0.93.1/tests/sites.old/coaster/fletch-coaster-gram2-gram2-fork.xml
branches/release-0.93.1/tests/sites.old/coaster/renci-engage-coaster.xml
branches/release-0.93.1/tests/sites.old/coaster/teraport-gt2-gt2-pbs.xml
branches/release-0.93.1/tests/sites.old/coaster/tgncsa-hg-coaster-pbs-gram2.xml
branches/release-0.93.1/tests/sites.old/coaster/tgncsa-hg-coaster-pbs-gram4.xml
branches/release-0.93.1/tests/sites.old/coaster/uj-pbs-gram2.xml
branches/release-0.93.1/tests/sites.old/communicado.ci.uchicago.edu/
branches/release-0.93.1/tests/sites.old/communicado.ci.uchicago.edu/local-condor.xml
branches/release-0.93.1/tests/sites.old/fletch-condor-gram2.xml
branches/release-0.93.1/tests/sites.old/fletch-fork-gram2.xml
branches/release-0.93.1/tests/sites.old/gwynn.bsd.uchicago.edu/
branches/release-0.93.1/tests/sites.old/gwynn.bsd.uchicago.edu/condor-provider.xml
branches/release-0.93.1/tests/sites.old/local-wrapper-args-file.xml
branches/release-0.93.1/tests/sites.old/localhost.xml
branches/release-0.93.1/tests/sites.old/osg-edu.cs.wisc.edu-condor.xml
branches/release-0.93.1/tests/sites.old/osg-edu.cs.wisc.edu-fork.xml
branches/release-0.93.1/tests/sites.old/pads-pbs-coasters.sh
branches/release-0.93.1/tests/sites.old/renci-engage-condor.xml
branches/release-0.93.1/tests/sites.old/run-all
branches/release-0.93.1/tests/sites.old/run-site
branches/release-0.93.1/tests/sites.old/tc.data
branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/
branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-fork-gram2.xml
branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-fork-gram4.xml
branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-gram2.xml
branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-gram4.xml
branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-local.xml
branches/release-0.93.1/tests/sites.old/tgncsa-hg-fork-gram2.xml
branches/release-0.93.1/tests/sites.old/tgncsa-hg-fork-gram4.xml
branches/release-0.93.1/tests/sites.old/tgncsa-hg-pbs-gram2.xml
branches/release-0.93.1/tests/sites.old/tgncsa-hg-pbs-gram4.xml
branches/release-0.93.1/tests/sites.old/tgpurdue-condor-gram2.xml
branches/release-0.93.1/tests/sites.old/tgpurdue-condor-gram4.xml
branches/release-0.93.1/tests/sites.old/tgpurdue-fork-gram2.xml
branches/release-0.93.1/tests/sites.old/tgpurdue-fork-gram4.xml
branches/release-0.93.1/tests/sites.old/tgtacc-fork-gram2.xml
branches/release-0.93.1/tests/sites.old/tgtacc-lsf-gram2.xml
branches/release-0.93.1/tests/sites.old/tguc-fork-gram2.xml
branches/release-0.93.1/tests/sites.old/tguc-fork-gram4.xml
branches/release-0.93.1/tests/sites.old/tguc-pbs-gram2-syntax1.xml
branches/release-0.93.1/tests/sites.old/tguc-pbs-gram2.xml
branches/release-0.93.1/tests/sites.old/tguc-pbs-gram4.xml
branches/release-0.93.1/tests/sites.old/tp-fork-gram2.xml
branches/release-0.93.1/tests/sites.old/tp-fork-gram4.xml
branches/release-0.93.1/tests/sites.old/tp-pbs-gram2.xml
branches/release-0.93.1/tests/sites.old/uj-fork-gram2.xml
branches/release-0.93.1/tests/sites.old/uj-pbs-gram2.xml
branches/release-0.93.1/tests/sites.old/wonky/
branches/release-0.93.1/tests/sites.old/wonky/relative-absolute-wrapper.xml
branches/release-0.93.1/tests/sites.old/wonky/slow-queue-fast-queue.xml
branches/release-0.93.1/tests/sites.old/wonky/wonky-80percent.xml
branches/release-0.93.1/tests/sites.old/wonky/wonky-90percent.xml
branches/release-0.93.1/tests/sites.old/wonky/wonky-failfirst.xml
branches/release-0.93.1/tests/sites.old/wonky/wonky-good.xml
branches/release-0.93.1/tests/sites.old/wonky/wonky-runawayjob.xml
branches/release-0.93.1/tests/sites.old/wonky/wrongdir.xml
branches/release-0.93.1/tests/sites/
branches/release-0.93.1/tests/sites/PADS/
branches/release-0.93.1/tests/sites/PADS/coasters/
branches/release-0.93.1/tests/sites/PADS/coasters/README
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.setup.sh
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.swift
branches/release-0.93.1/tests/sites/PADS/coasters/catsn.timeout
branches/release-0.93.1/tests/sites/PADS/coasters/data.txt
branches/release-0.93.1/tests/sites/PADS/coasters/sites.template.xml
branches/release-0.93.1/tests/sites/PADS/coasters/tc.template.data
branches/release-0.93.1/tests/sites/PADS/pbs/
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.setup.sh
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.swift
branches/release-0.93.1/tests/sites/PADS/pbs/catsn.timeout
branches/release-0.93.1/tests/sites/PADS/pbs/data.txt
branches/release-0.93.1/tests/sites/PADS/pbs/sites.template.xml
branches/release-0.93.1/tests/sites/PADS/pbs/tc.template.data
branches/release-0.93.1/tests/sites/beagle/
branches/release-0.93.1/tests/sites/beagle/coasters/
branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.check.sh
branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.setup.sh
branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.swift
branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.timeout
branches/release-0.93.1/tests/sites/beagle/coasters/data.txt
branches/release-0.93.1/tests/sites/beagle/coasters/sites.template.xml
branches/release-0.93.1/tests/sites/beagle/coasters/tc.template.data
branches/release-0.93.1/tests/sites/beagle/coasters/title.txt
branches/release-0.93.1/tests/sites/beagle/pbs/
branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.check.sh
branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.setup.sh
branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.swift
branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.timeout
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/beagle/pbs/data.txt
branches/release-0.93.1/tests/sites/beagle/pbs/sites.template.xml
branches/release-0.93.1/tests/sites/beagle/pbs/tc.template.data
branches/release-0.93.1/tests/sites/crow/
branches/release-0.93.1/tests/sites/crow/001-catsn.check.sh
branches/release-0.93.1/tests/sites/crow/001-catsn.clean.sh
branches/release-0.93.1/tests/sites/crow/001-catsn.setup.sh
branches/release-0.93.1/tests/sites/crow/001-catsn.swift
branches/release-0.93.1/tests/sites/crow/001-catsn.timeout
branches/release-0.93.1/tests/sites/crow/big/
branches/release-0.93.1/tests/sites/crow/big/201-cps.check.sh
branches/release-0.93.1/tests/sites/crow/big/201-cps.clean.sh
branches/release-0.93.1/tests/sites/crow/big/201-cps.setup.sh
branches/release-0.93.1/tests/sites/crow/big/201-cps.swift
branches/release-0.93.1/tests/sites/crow/big/201-cps.timeout
branches/release-0.93.1/tests/sites/crow/big/cps.sh
branches/release-0.93.1/tests/sites/crow/big/data.txt
branches/release-0.93.1/tests/sites/crow/big/sites.template.xml
branches/release-0.93.1/tests/sites/crow/big/title.txt
branches/release-0.93.1/tests/sites/crow/data.txt
branches/release-0.93.1/tests/sites/crow/sites.template.xml
branches/release-0.93.1/tests/sites/crow/tc.template.data
branches/release-0.93.1/tests/sites/crow/title.txt
branches/release-0.93.1/tests/sites/fusion/
branches/release-0.93.1/tests/sites/fusion/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/fusion/catsn.setup.sh
branches/release-0.93.1/tests/sites/fusion/catsn.swift
branches/release-0.93.1/tests/sites/fusion/catsn.timeout
branches/release-0.93.1/tests/sites/fusion/data.txt
branches/release-0.93.1/tests/sites/fusion/sites.template.xml
branches/release-0.93.1/tests/sites/fusion/tc.template.data
branches/release-0.93.1/tests/sites/ibicluster/
branches/release-0.93.1/tests/sites/ibicluster/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/ibicluster/catsn.check.sh
branches/release-0.93.1/tests/sites/ibicluster/catsn.setup.sh
branches/release-0.93.1/tests/sites/ibicluster/catsn.swift
branches/release-0.93.1/tests/sites/ibicluster/catsn.timeout
branches/release-0.93.1/tests/sites/ibicluster/data.txt
branches/release-0.93.1/tests/sites/ibicluster/sites.template.xml
branches/release-0.93.1/tests/sites/ibicluster/tc.template.data
branches/release-0.93.1/tests/sites/ibicluster/title.txt
branches/release-0.93.1/tests/sites/intrepid/
branches/release-0.93.1/tests/sites/intrepid/100-cp.check.sh
branches/release-0.93.1/tests/sites/intrepid/100-cp.clean.sh
branches/release-0.93.1/tests/sites/intrepid/100-cp.setup.sh
branches/release-0.93.1/tests/sites/intrepid/100-cp.swift
branches/release-0.93.1/tests/sites/intrepid/100-cp.timeout
branches/release-0.93.1/tests/sites/intrepid/sites.template.xml
branches/release-0.93.1/tests/sites/intrepid/tc.template.data
branches/release-0.93.1/tests/sites/intrepid/title.txt
branches/release-0.93.1/tests/sites/local-coasters/
branches/release-0.93.1/tests/sites/local-coasters/200-cp.check.sh
branches/release-0.93.1/tests/sites/local-coasters/200-cp.clean.sh
branches/release-0.93.1/tests/sites/local-coasters/200-cp.setup.sh
branches/release-0.93.1/tests/sites/local-coasters/200-cp.swift
branches/release-0.93.1/tests/sites/local-coasters/201-cp.check.sh
branches/release-0.93.1/tests/sites/local-coasters/201-cp.clean.sh
branches/release-0.93.1/tests/sites/local-coasters/201-cp.setup.sh
branches/release-0.93.1/tests/sites/local-coasters/201-cp.swift
branches/release-0.93.1/tests/sites/local-coasters/README.txt
branches/release-0.93.1/tests/sites/local-coasters/sites.template.xml
branches/release-0.93.1/tests/sites/local-coasters/tc.template.data
branches/release-0.93.1/tests/sites/local-coasters/title.txt
branches/release-0.93.1/tests/sites/local/
branches/release-0.93.1/tests/sites/local/001-catsn-local.check.sh
branches/release-0.93.1/tests/sites/local/001-catsn-local.setup.sh
branches/release-0.93.1/tests/sites/local/001-catsn-local.swift
branches/release-0.93.1/tests/sites/local/001-catsn-local.timeout
branches/release-0.93.1/tests/sites/local/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/local/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/local/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/local/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/local/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/local/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/local/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/local/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/local/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/local/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/local/data.txt
branches/release-0.93.1/tests/sites/local/sites.template.xml
branches/release-0.93.1/tests/sites/local/tc.template.data
branches/release-0.93.1/tests/sites/local/title.txt
branches/release-0.93.1/tests/sites/mcs/
branches/release-0.93.1/tests/sites/mcs/001-catsn.check.sh
branches/release-0.93.1/tests/sites/mcs/001-catsn.clean.sh
branches/release-0.93.1/tests/sites/mcs/001-catsn.setup.sh
branches/release-0.93.1/tests/sites/mcs/001-catsn.swift
branches/release-0.93.1/tests/sites/mcs/001-catsn.timeout
branches/release-0.93.1/tests/sites/mcs/README
branches/release-0.93.1/tests/sites/mcs/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/mcs/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/mcs/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/mcs/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/mcs/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/mcs/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/mcs/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/mcs/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/mcs/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/mcs/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/mcs/coaster-service.conf
branches/release-0.93.1/tests/sites/mcs/data.txt
branches/release-0.93.1/tests/sites/mcs/title.txt
branches/release-0.93.1/tests/sites/queenbee/
branches/release-0.93.1/tests/sites/queenbee/pbs/
branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.check.sh
branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.swift
branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.timeout
branches/release-0.93.1/tests/sites/queenbee/pbs/README
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/queenbee/pbs/data.txt
branches/release-0.93.1/tests/sites/queenbee/pbs/sites.template.xml
branches/release-0.93.1/tests/sites/queenbee/pbs/tc.template.data
branches/release-0.93.1/tests/sites/queenbee/pbs/title.txt
branches/release-0.93.1/tests/sites/ranger/
branches/release-0.93.1/tests/sites/ranger/gt2/
branches/release-0.93.1/tests/sites/ranger/gt2/001-catsn-ranger.swift
branches/release-0.93.1/tests/sites/ranger/gt2/cf
branches/release-0.93.1/tests/sites/ranger/gt2/data.txt
branches/release-0.93.1/tests/sites/ranger/gt2/sites.template.xml
branches/release-0.93.1/tests/sites/ranger/gt2/start_proxy.sh
branches/release-0.93.1/tests/sites/ranger/gt2/tc.template.data
branches/release-0.93.1/tests/sites/ranger/local/
branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.check.sh
branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.setup.sh
branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.swift
branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.timeout
branches/release-0.93.1/tests/sites/ranger/local/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/ranger/local/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/ranger/local/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/ranger/local/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/ranger/local/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/ranger/local/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/ranger/local/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/ranger/local/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/ranger/local/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/ranger/local/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/ranger/local/data.txt
branches/release-0.93.1/tests/sites/ranger/local/sites.template.xml
branches/release-0.93.1/tests/sites/ranger/local/sleep.swift
branches/release-0.93.1/tests/sites/ranger/local/tc.template.data
branches/release-0.93.1/tests/sites/ranger/local/title.txt
branches/release-0.93.1/tests/sites/surveyor/
branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.check.sh
branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.setup.sh
branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.swift
branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.timeout
branches/release-0.93.1/tests/sites/surveyor/README
branches/release-0.93.1/tests/sites/surveyor/catsn.0001.out.expected
branches/release-0.93.1/tests/sites/surveyor/catsn.0002.out.expected
branches/release-0.93.1/tests/sites/surveyor/catsn.0003.out.expected
branches/release-0.93.1/tests/sites/surveyor/catsn.0004.out.expected
branches/release-0.93.1/tests/sites/surveyor/catsn.0005.out.expected
branches/release-0.93.1/tests/sites/surveyor/catsn.0006.out.expected
branches/release-0.93.1/tests/sites/surveyor/catsn.0007.out.expected
branches/release-0.93.1/tests/sites/surveyor/catsn.0008.out.expected
branches/release-0.93.1/tests/sites/surveyor/catsn.0009.out.expected
branches/release-0.93.1/tests/sites/surveyor/catsn.0010.out.expected
branches/release-0.93.1/tests/sites/surveyor/data.txt
branches/release-0.93.1/tests/sites/surveyor/sites.template.xml
branches/release-0.93.1/tests/sites/surveyor/tc.template.data
branches/release-0.93.1/tests/sites/surveyor/title.txt
Modified:
branches/release-0.93.1/
branches/release-0.93.1/bin/gensites
branches/release-0.93.1/bin/start-coaster-service
branches/release-0.93.1/bin/stop-coaster-service
branches/release-0.93.1/bin/swift
branches/release-0.93.1/docs/build_docs.sh
branches/release-0.93.1/docs/siteguide/beagle
branches/release-0.93.1/docs/siteguide/fusion
branches/release-0.93.1/docs/siteguide/futuregrid
branches/release-0.93.1/docs/siteguide/intrepid
branches/release-0.93.1/docs/siteguide/pads
branches/release-0.93.1/docs/siteguide/siteguide.txt
branches/release-0.93.1/docs/userguide/cdm
branches/release-0.93.1/docs/userguide/userguide.txt
branches/release-0.93.1/etc/coaster-service.conf
branches/release-0.93.1/etc/sites/intrepid
branches/release-0.93.1/etc/sites/persistent-coasters
branches/release-0.93.1/libexec/_swiftwrap.staging
branches/release-0.93.1/libexec/log-processing/active-state-transitions
branches/release-0.93.1/libexec/log-processing/add-runid-as-prefix
branches/release-0.93.1/libexec/log-processing/affine-transform
branches/release-0.93.1/libexec/log-processing/aggregate.html.template
branches/release-0.93.1/libexec/log-processing/all-kickstarts-to-event
branches/release-0.93.1/libexec/log-processing/all-logs-active-jobsubmissions-count-graph
branches/release-0.93.1/libexec/log-processing/annotate-karatasks-with-execute2-id
branches/release-0.93.1/libexec/log-processing/assorted.html.template
branches/release-0.93.1/libexec/log-processing/autospace-data
branches/release-0.93.1/libexec/log-processing/b.plot
branches/release-0.93.1/libexec/log-processing/bars
branches/release-0.93.1/libexec/log-processing/cli-finished
branches/release-0.93.1/libexec/log-processing/cli-version
branches/release-0.93.1/libexec/log-processing/cluster-report
branches/release-0.93.1/libexec/log-processing/cluster-stats
branches/release-0.93.1/libexec/log-processing/colour-execute2
branches/release-0.93.1/libexec/log-processing/colour-execute2-by-falkon
branches/release-0.93.1/libexec/log-processing/colour-karatasks
branches/release-0.93.1/libexec/log-processing/colour.plot.template
branches/release-0.93.1/libexec/log-processing/coloured-event-plot
branches/release-0.93.1/libexec/log-processing/combine-execute-start-last-times
branches/release-0.93.1/libexec/log-processing/combine-start-last-times
branches/release-0.93.1/libexec/log-processing/combine-start-last-times-to-event
branches/release-0.93.1/libexec/log-processing/compute-t-inf
branches/release-0.93.1/libexec/log-processing/create-everylog-vs-versions-data
branches/release-0.93.1/libexec/log-processing/duration-histogram.plot
branches/release-0.93.1/libexec/log-processing/duration-of-workflow
branches/release-0.93.1/libexec/log-processing/error-summary
branches/release-0.93.1/libexec/log-processing/event-duration-stats
branches/release-0.93.1/libexec/log-processing/events-in-progress
branches/release-0.93.1/libexec/log-processing/events-in-progress-first-loop.pl
branches/release-0.93.1/libexec/log-processing/events-in-progress-second-loop.pl
branches/release-0.93.1/libexec/log-processing/events-in-progress-third-loop.pl
branches/release-0.93.1/libexec/log-processing/everylog-active-submissions.plot
branches/release-0.93.1/libexec/log-processing/everylog-durations-of-workflows
branches/release-0.93.1/libexec/log-processing/everylog-summary.html
branches/release-0.93.1/libexec/log-processing/everylog-time-cumulative.plot
branches/release-0.93.1/libexec/log-processing/everylog-to-event
branches/release-0.93.1/libexec/log-processing/everylog-version-cumulative.plot
branches/release-0.93.1/libexec/log-processing/everylog-vs-versions
branches/release-0.93.1/libexec/log-processing/everylog-vs-versions.plot
branches/release-0.93.1/libexec/log-processing/everylog.html
branches/release-0.93.1/libexec/log-processing/execstages-plot
branches/release-0.93.1/libexec/log-processing/execstages.plot.template
branches/release-0.93.1/libexec/log-processing/execute.html.template
branches/release-0.93.1/libexec/log-processing/execute.progress
branches/release-0.93.1/libexec/log-processing/execute2-by-falkon.channels
branches/release-0.93.1/libexec/log-processing/execute2-status-from-log
branches/release-0.93.1/libexec/log-processing/execute2-summary-from-log
branches/release-0.93.1/libexec/log-processing/execute2.html.template
branches/release-0.93.1/libexec/log-processing/execution-summaries
branches/release-0.93.1/libexec/log-processing/extract-activity-for-subthreads-of
branches/release-0.93.1/libexec/log-processing/extract-activity-for-task
branches/release-0.93.1/libexec/log-processing/extract-activity-for-thread
branches/release-0.93.1/libexec/log-processing/extract-completed-time-for-run-id
branches/release-0.93.1/libexec/log-processing/extract-end-time
branches/release-0.93.1/libexec/log-processing/extract-execute-start-times
branches/release-0.93.1/libexec/log-processing/extract-failed-time-for-run-id
branches/release-0.93.1/libexec/log-processing/extract-jobid-karajanid-bindings
branches/release-0.93.1/libexec/log-processing/extract-last-time-for-execute
branches/release-0.93.1/libexec/log-processing/extract-start-time
branches/release-0.93.1/libexec/log-processing/extract-start-times
branches/release-0.93.1/libexec/log-processing/falkon-to-event
branches/release-0.93.1/libexec/log-processing/falkon.html.template
branches/release-0.93.1/libexec/log-processing/generate-karatasks-event
branches/release-0.93.1/libexec/log-processing/get-jobid-for-karajanid
branches/release-0.93.1/libexec/log-processing/get-replicationid-for-execute2id
branches/release-0.93.1/libexec/log-processing/get-site-for-run-id
branches/release-0.93.1/libexec/log-processing/get-thread-for-run-id
branches/release-0.93.1/libexec/log-processing/index.html.template
branches/release-0.93.1/libexec/log-processing/info-and-karajan-actives
branches/release-0.93.1/libexec/log-processing/info-and-karajan-actives.2.plot
branches/release-0.93.1/libexec/log-processing/info-and-karajan-actives.plot
branches/release-0.93.1/libexec/log-processing/info-to-md5
branches/release-0.93.1/libexec/log-processing/info-to-transitions
branches/release-0.93.1/libexec/log-processing/info-to-zeroed-transitions
branches/release-0.93.1/libexec/log-processing/info.html.template
branches/release-0.93.1/libexec/log-processing/iso-to-secs
branches/release-0.93.1/libexec/log-processing/karajan.html.template
branches/release-0.93.1/libexec/log-processing/karatasks-coloured.channels
branches/release-0.93.1/libexec/log-processing/karatasks-coloured.channels.nm
branches/release-0.93.1/libexec/log-processing/karatasks-only
branches/release-0.93.1/libexec/log-processing/kickstart.html.template
branches/release-0.93.1/libexec/log-processing/kickstarts-to-event
branches/release-0.93.1/libexec/log-processing/kickstarts-to-plot
branches/release-0.93.1/libexec/log-processing/last-times
branches/release-0.93.1/libexec/log-processing/last-transition-line
branches/release-0.93.1/libexec/log-processing/list-known-tasks
branches/release-0.93.1/libexec/log-processing/list-known-threads
branches/release-0.93.1/libexec/log-processing/log-to-createdirset-transitions
branches/release-0.93.1/libexec/log-processing/log-to-dostagein-transitions
branches/release-0.93.1/libexec/log-processing/log-to-dostageout-transitions
branches/release-0.93.1/libexec/log-processing/log-to-execute-transitions
branches/release-0.93.1/libexec/log-processing/log-to-execute2-transitions
branches/release-0.93.1/libexec/log-processing/log-to-initshareddir-transitions
branches/release-0.93.1/libexec/log-processing/log-to-karatasks-transitions
branches/release-0.93.1/libexec/log-processing/logs-for-all
branches/release-0.93.1/libexec/log-processing/lookup-colour
branches/release-0.93.1/libexec/log-processing/makefile
branches/release-0.93.1/libexec/log-processing/makefile.cluster
branches/release-0.93.1/libexec/log-processing/makefile.errors
branches/release-0.93.1/libexec/log-processing/makefile.falkon
branches/release-0.93.1/libexec/log-processing/makefile.implicit
branches/release-0.93.1/libexec/log-processing/makefile.karatasks
branches/release-0.93.1/libexec/log-processing/makefile.kickstart
branches/release-0.93.1/libexec/log-processing/makefile.webpage
branches/release-0.93.1/libexec/log-processing/max-duration
branches/release-0.93.1/libexec/log-processing/normalise-event-start-time
branches/release-0.93.1/libexec/log-processing/normalise-event-start-time-to-any
branches/release-0.93.1/libexec/log-processing/number-events
branches/release-0.93.1/libexec/log-processing/number-sites-list
branches/release-0.93.1/libexec/log-processing/overview-reports.sh
branches/release-0.93.1/libexec/log-processing/overview.html.template
branches/release-0.93.1/libexec/log-processing/p1.plot
branches/release-0.93.1/libexec/log-processing/per-site-execute2-durations
branches/release-0.93.1/libexec/log-processing/plot-duration-histogram
branches/release-0.93.1/libexec/log-processing/plot-everylogs
branches/release-0.93.1/libexec/log-processing/plot1
branches/release-0.93.1/libexec/log-processing/q.plot
branches/release-0.93.1/libexec/log-processing/queue-state-transitions
branches/release-0.93.1/libexec/log-processing/retrycounts
branches/release-0.93.1/libexec/log-processing/scheduler.html.template
branches/release-0.93.1/libexec/log-processing/sec-to-utc
branches/release-0.93.1/libexec/log-processing/sec-to-utc-day
branches/release-0.93.1/libexec/log-processing/separate-execute-last-summary
branches/release-0.93.1/libexec/log-processing/simple-event-plot
branches/release-0.93.1/libexec/log-processing/slt2.plot
branches/release-0.93.1/libexec/log-processing/sort-preserve
branches/release-0.93.1/libexec/log-processing/sp.plot.template
branches/release-0.93.1/libexec/log-processing/split-start-times-shifted
branches/release-0.93.1/libexec/log-processing/start-last-times-and-kickstart
branches/release-0.93.1/libexec/log-processing/start-last-times-and-kickstart.plot
branches/release-0.93.1/libexec/log-processing/start-last-times.plot
branches/release-0.93.1/libexec/log-processing/start-times.plot
branches/release-0.93.1/libexec/log-processing/sum-tt1.pl
branches/release-0.93.1/libexec/log-processing/swap-and-sort
branches/release-0.93.1/libexec/log-processing/swap-and-sort-and-swap
branches/release-0.93.1/libexec/log-processing/swift-standard-log-to-transition
branches/release-0.93.1/libexec/log-processing/table-jobs-sites
branches/release-0.93.1/libexec/log-processing/task-status-to-transitions
branches/release-0.93.1/libexec/log-processing/tasks-in-cluster
branches/release-0.93.1/libexec/log-processing/tie-url-filenames
branches/release-0.93.1/libexec/log-processing/times-for-all-tasks
branches/release-0.93.1/libexec/log-processing/toolbar.html.template
branches/release-0.93.1/libexec/log-processing/total-event-plot
branches/release-0.93.1/libexec/log-processing/total.plot.template
branches/release-0.93.1/libexec/log-processing/trail
branches/release-0.93.1/libexec/log-processing/trail-freex
branches/release-0.93.1/libexec/log-processing/trail-freex.plot.template
branches/release-0.93.1/libexec/log-processing/trail.plot.template
branches/release-0.93.1/libexec/log-processing/transitions-to-cedps
branches/release-0.93.1/libexec/log-processing/transitions-to-event
branches/release-0.93.1/libexec/log-processing/tscore.sh
branches/release-0.93.1/libexec/log-processing/tscores.plot
branches/release-0.93.1/libexec/log-processing/weights.plot
branches/release-0.93.1/libexec/log-processing/weights.sh
branches/release-0.93.1/libexec/log-processing/whole-workflow-event
branches/release-0.93.1/libexec/log-processing/whole-workflow-time
branches/release-0.93.1/resources/swiftscript.stg
branches/release-0.93.1/src/org/griphyn/vdl/engine/Karajan.java
branches/release-0.93.1/src/org/griphyn/vdl/karajan/ArrayIndexFutureList.java
branches/release-0.93.1/src/org/griphyn/vdl/karajan/FutureTracker.java
branches/release-0.93.1/src/org/griphyn/vdl/karajan/Monitor.java
branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/CreateArray.java
branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java
branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/VDLFunction.java
branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/swiftscript/Java.java
branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/swiftscript/Misc.java
branches/release-0.93.1/src/org/griphyn/vdl/mapping/AbstractDataNode.java
branches/release-0.93.1/src/org/griphyn/vdl/mapping/RootArrayDataNode.java
branches/release-0.93.1/src/org/griphyn/vdl/mapping/RootDataNode.java
branches/release-0.93.1/tests/
branches/release-0.93.1/tests/USAGENOTES.txt
branches/release-0.93.1/tests/groups/
branches/release-0.93.1/tests/suite.sh
Log:
merged changes from 0.93 release branch
Property changes on: branches/release-0.93.1
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/release-0.93:5279-5504
Modified: branches/release-0.93.1/bin/gensites
===================================================================
--- branches/release-0.93.1/bin/gensites 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/bin/gensites 2012-01-22 03:23:13 UTC (rev 5505)
@@ -187,6 +187,12 @@
"#site $TEMPLATE internalhostname="*|'#site internalhostname='*)
INTERNALHOSTNAME=`get_value $line`
;;
+ "#site $TEMPLATE jobs_per_node="*|'#site jobs_per_node='*)
+ JOBS_PER_NODE=`get_value $line`
+ ;;
+ "#site $TEMPLATE job_throttle="*|'#site job_throttle='*)
+ JOB_THROTTLE=`get_value $line`
+ ;;
'#app'*)
if [ `echo $line | wc -w` == 2 ]; then
for HOST in $HOSTS
@@ -215,12 +221,12 @@
fi
# Verify that the variables by the template are defined
-for TOKEN in NODES HOST WORK PROJECT QUEUE N_GRAN N_MAX SLOTS INTERNALHOSTNAME MAXTIME EXECUTION_URL
+for TOKEN in NODES HOST WORK PROJECT QUEUE N_GRAN N_MAX SLOTS INTERNALHOSTNAME MAXTIME EXECUTION_URL JOBS_PER_NODE JOB_THROTTLE
do
# Test for HOST/GLOBUS_HOSTNAME - the only values which don't match
if [ "$TOKEN" == "HOST" ]; then
if [ -z "$GLOBUS_HOSTNAME" ]; then
- crash "Not specified: GLOBUS_HOSTNAME"
+ GLOBUS_HOSTNAME=$( hostname -f )
fi
elif grep _${TOKEN}_ $TEMPLATE_PATH > /dev/null; then
if [ -z "${!TOKEN}" ]; then
@@ -245,6 +251,8 @@
echo "s at _EXECUTION_URL_@${EXECUTION_URL}@"
echo "s at _SERVICE_COASTERS_@${SERVICE_COASTERS:-NO_URL_GIVEN}@"
echo "s at _SERVICE_PORT_@${SERVICE_PORT:-NO_PORT_GIVEN}@"
+ echo "s at _JOBS_PER_NODE_@${JOBS_PER_NODE}@"
+ echo "s at _JOB_THROTTLE_@${JOB_THROTTLE}@"
} > $SEDFILE
Modified: branches/release-0.93.1/bin/start-coaster-service
===================================================================
--- branches/release-0.93.1/bin/start-coaster-service 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/bin/start-coaster-service 2012-01-22 03:23:13 UTC (rev 5505)
@@ -11,46 +11,201 @@
# Start futuregrid workers
start-workers-futuregrid()
{
+ # Setup environment
PORT=$1
EXECUTION_URL=http://localhost:$PORT
+ export EC2_ACCESS_KEY=$FUTUREGRID_IAAS_ACCESS_KEY
+ export EC2_SECRET_KEY=$FUTUREGRID_IAAS_SECRET_KEY
- if [ ! -d "$SWIFTVMBOOT_DIR" ] || [ ! -x "$SWIFTVMBOOT_DIR/bin/bootit.sh" ]; then
+ # Check that SWIFTVMBOOT_DIR looks ok
+ if [ ! -d "$SWIFTVMBOOT_DIR" ] || [ ! -x "$SWIFTVMBOOT_DIR/futuregrid/bin/bootit.sh" ]; then
crash "SWIFTVMBOOT_DIR incorrectly defined in coaster-service.conf"
fi
+ # Install ve
+ if [ ! -d "$SWIFTVMBOOT_DIR/futuregrid/ve" ]; then
+ echo Setting up environment
+ python $SWIFTVMBOOT_DIR/futuregrid/bin/virtualenv.py $SWIFTVMBOOT_DIR/futuregrid/ve
+ if [ $? -ne 0 ]; then
+ echo "Failed to created the needed python virtual environment"
+ exit 1
+ fi
+ fi
+
+ # Install cloudinitd
+ source $SWIFTVMBOOT_DIR/futuregrid/ve/bin/activate
+ easy_install cloudinitd
+ if [ $? -ne 0 ]; then
+ echo "Failed to install cloudinitd"
+ exit 1
+ fi
+
+ # Register key
+ echo "Registering the key names in all the clouds"
+ python $SWIFTVMBOOT_DIR/futuregrid/bin/register_key.py $SWIFTVMBOOT_DIR/futuregrid/hosts.txt
+ if [ $? -ne 0 ]; then
+ echo "Failed to register the key names"
+ exit 1
+ fi
+
+ # Start virtual machines
echo Starting virtual machines.. please wait
- $SWIFTVMBOOT_DIR/bin/bootit.sh
- SWIFTVMBOOT_OUTPUT=$SWIFTVMBOOT_DIR/output.json
-
+ $SWIFTVMBOOT_DIR/futuregrid/bin/bootit.sh | tee -a bootit.log
+ SWIFTVMBOOT_OUTPUT=$SWIFTVMBOOT_DIR/futuregrid/output.json
if [ ! -f "$SWIFTVMBOOT_OUTPUT" ]; then
crash "Error: Swift VM output file $SWIFTVMBOOT_OUTPUT does not exist!"
fi
- SWIFTVM_INSTANCES=`grep instance_id $SWIFTVMBOOT_OUTPUT |awk '{print $2}'|sed 's/\"//g;s/,//g;s/null//g'`
- echo $SWIFTVM_INSTANCES > .swiftvm_instances
-
+ SWIFTVM_INSTANCE=`grep "Starting up run" bootit.log |awk '{print $4}'`
+ echo $SWIFTVM_INSTANCE >> $HOME/.swift/.swiftvm_instances
WORKER_HOSTS=`grep hostname $SWIFTVMBOOT_OUTPUT |awk '{print $2}'|sed 's/\"//g;s/,//g;s/null//g'`
# Start worker script
for MACHINE in $WORKER_HOSTS
do
- # Enable ssh tunneling if needed
+ echo $MACHINE >> $HOME/.swift/machines
+ scp $SWIFT_BIN/$WORKER $WORKER_USERNAME@$MACHINE:$WORKER_LOCATION > /dev/null 2>&1
if [ "$SSH_TUNNELING" == "yes" ]; then
ssh -R *:$PORT:localhost:$PORT $WORKER_USERNAME@$MACHINE sleep 999 &
echo $! >> $PID_FILE
+ echo "Starting worker on $MACHINE"
+ ssh $WORKER_USERNAME@$MACHINE "$WORKER_LOCATION/$WORKER http://localhost:$PORT $MACHINE $LOG_DIR" &
+ echo $! >> $PID_FILE
+ else
+ echo "Starting worker on $MACHINE"
+ ssh $WORKER_USERNAME@$MACHINE "$WORKER_LOCATION/$WORKER $EXECUTION_URL $MACHINE $LOG_DIR" &
+ echo $! >> $PID_FILE
fi
+
+ done
+}
+# Globus Provision workers
+start-workers-gp()
+{
+ PORT=$1
+ EXECUTION_URL=http://localhost:$PORT
+
+ if [ ! -d "$SWIFTVMBOOT_DIR" ] || [ ! -x "$SWIFTVMBOOT_DIR/bin/gp-instance-create" ]; then
+ crash "SWIFTVMBOOT_DIR incorrectly defined in coaster-service.conf"
+ fi
+
+ SEDFILE=`mktemp`
+ {
+ echo "s at _CLUSTER-NODES_@$EC2_NODES@"
+ echo "s at _INSTANCE-TYPE_@$EC2_INSTANCE_TYPE@"
+ echo "s at _KEYPAIR_@$EC2_KEYPAIR@"
+ echo "s at _KEYFILE_@$EC2_KEYFILE@"
+ echo "s at _AMI_@$EC2_AMI@"
+ } > $SEDFILE
+ sed -f $SEDFILE < "$SWIFTVMBOOT_DIR/ec2.template.conf" > "$SWIFTVMBOOT_DIR/ec2.conf"
+ rm $SEDFILE
+
+ echo Creating instance..
+ "$SWIFTVMBOOT_DIR/bin/gp-instance-create" -c "$SWIFTVMBOOT_DIR/ec2.conf" | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" | tee -a gpic.out
+ SWIFTVM_INSTANCE=`awk '{print $4}' gpic.out`
+ rm gpic.out
+ echo $SWIFTVM_INSTANCE >> $HOME/.swift/.swiftvm_instance
+
+ echo Starting instance..
+ "$SWIFTVMBOOT_DIR/bin/gp-instance-start" "$SWIFTVM_INSTANCE" | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"
+ WORKER_HOSTS=`$SWIFTVMBOOT_DIR/bin/gp-instance-describe $SWIFTVM_INSTANCE|sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"|awk '{print $3}'`
+
+ # Start worker script
+ if [ -f "$HOME/.swift/machines" ]; then
+ rm $HOME/.swift/machines
+ fi
+ for MACHINE in $WORKER_HOSTS
+ do
+ # Create a list of machines for other applications, if needed
+ echo $MACHINE >> $HOME/.swift/machines
+
+ # Enable ssh tunneling if needed
+ if [ "$SSH_TUNNELING" == "yes" ]; then
+ ssh -q -o StrictHostKeyChecking=no -R *:$PORT:localhost:$PORT $WORKER_USERNAME@$MACHINE sleep 999 &
+ echo $! >> $PID_FILE
+ fi
+
# Copy and start worker script
- scp $SWIFT_BIN/$WORKER $WORKER_USERNAME@$MACHINE:$WORKER_WORK > /dev/null 2>&1
+ scp -q -o StrictHostKeyChecking=no $SWIFT_BIN/$WORKER $WORKER_USERNAME@$MACHINE:$WORKER_LOCATION > /dev/null 2>&1
echo "Starting worker on $MACHINE"
- ssh $WORKER_USERNAME@$MACHINE "$WORKER_WORK/$WORKER $EXECUTION_URL $MACHINE $LOG_DIR" &
- echo $! >> $PID_FILE
+ ssh -q -o StrictHostKeyChecking=no $WORKER_USERNAME@$MACHINE "$WORKER_LOCATION/$WORKER $EXECUTION_URL $MACHINE $LOG_DIR" &
+ echo $! >> $PID_FILE
done
}
+# EC2 workers
+start-workers-ec2()
+{
+ PORT=$1
+ EXECUTION_URL=http://localhost:$PORT
+ if [ ! -d "$SWIFTVMBOOT_DIR" ] || [ ! -x "$SWIFTVMBOOT_DIR/ec2/bin/ec2-run-instances" ]; then
+ crash "SWIFTVMBOOT_DIR incorrectly defined in coaster-service.conf"
+ fi
+
+ export EC2_HOME="$SWIFTVMBOOT_DIR/ec2"
+ export EC2_PRIVATE_KEY="$EC2_KEYFILE"
+ export EC2_CERT="$EC2_CERTFILE"
+
+ echo Creating instance..
+ $SWIFTVMBOOT_DIR/ec2/bin/ec2-run-instances "$EC2_AMI" -t "$EC2_INSTANCE_TYPE" -n "$EC2_NODES" -K "$EC2_KEYFILE" -C "$EC2_CERT"
+ SWIFTVM_INSTANCES=$( $SWIFTVMBOOT_DIR/ec2/bin/ec2-describe-instances | grep INSTANCE | grep -v terminated |awk '{print $2}' )
+ echo $SWIFTVM_INSTANCES >> $HOME/.swift/.swiftvm_instances
+ echo Waiting for nodes to boot..
+
+ # Wait until all instances are listed as running
+ while /bin/true
+ do
+ SWIFTVM_INSTANCES_AS_STRING=$( echo $SWIFTVM_INSTANCES | tr "\\n" " ")
+ STATUS_LIST=$( $SWIFTVMBOOT_DIR/ec2/bin/ec2-describe-instances $SWIFTVM_INSTANCES_AS_STRING | grep INSTANCE | grep -v terminated | awk '{print $6}' |sort -u )
+ if [ "$STATUS_LIST" == "running" ]; then
+ break
+ fi
+ sleep 5
+ done
+
+ # There is some delay between when the machines are 'running', and when system utilities like sshd are started
+ sleep 30
+
+ WORKER_HOSTS=$( $SWIFTVMBOOT_DIR/ec2/bin/ec2-describe-instances $SWIFTVM_INSTANCES_AS_STRING | grep INSTANCE | grep -v terminated | awk '{print $4}' )
+
+ if [ -f "$HOME/.swift/machines" ]; then
+ rm $HOME/.swift/machines
+ fi
+
+ # Start worker script
+ SSH_OPTS="-i $EC2_KEYFILE -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+ for MACHINE in $WORKER_HOSTS
+ do
+
+ # Create a list of machines for other applications, if needed
+ echo $MACHINE >> $HOME/.swift/machines
+
+ # Copy and start worker script
+ scp $SSH_OPTS $SWIFT_BIN/$WORKER $WORKER_USERNAME@$MACHINE:$WORKER_LOCATION > /dev/null 2>&1
+ echo $! >> $PID_FILE
+
+ # Enable ssh tunneling if needed
+ if [ "$SSH_TUNNELING" == "yes" ]; then
+ ssh $SSH_OPTS -R *:$PORT:localhost:$PORT $WORKER_USERNAME@$MACHINE sleep 999 > /dev/null 2>&1 &
+ sleep 10
+ ssh $SSH_OPTS $WORKER_USERNAME@$MACHINE "$WORKER_LOCATION/$WORKER http://localhost:$PORT $MACHINE $LOG_DIR" 2>&1 &
+ echo $! >> $PID_FILE
+ else
+ echo "Starting worker on $MACHINE"
+ ssh $SSH_OPTS $WORKER_USERNAME@$MACHINE "$WORKER_LOCATION/$WORKER $EXECUTION_URL $MACHINE $LOG_DIR" > /dev/null 2>&1 &
+ echo $! >> $PID_FILE
+ fi
+
+ # Copy SSH key for easier access
+ cat $HOME/.ssh/*.pub | ssh $SSH_OPTS $WORKER_USERNAME@$MACHINE 'umask 077; cat >> $HOME/.ssh/authorized_keys' > /dev/null 2>&1
+ done
+}
+
+
# Start SSH workers
start-workers-ssh()
-{
+{
PORT=$1
EXECUTION_URL=http://$IPADDR:$PORT
if [ -z "$PORT" ]; then
@@ -71,16 +226,17 @@
# Use a relay host
if [ -n "$WORKER_RELAY_HOST" ]; then
- ssh $WORKER_USERNAME@$WORKER_RELAY_HOST ssh $MACHINE mkdir -p $WORKER_WORK > /dev/null 2>&1
- ssh $WORKER_USERNAME@$WORKER_RELAY_HOST "scp /tmp/$WORKER $WORKER_USERNAME@$MACHINE:$WORKER_WORK" > /dev/null 2>&1
+ ssh $WORKER_USERNAME@$WORKER_RELAY_HOST ssh $MACHINE mkdir -p $WORKER_LOCATION > /dev/null 2>&1
+ ssh $WORKER_USERNAME@$WORKER_RELAY_HOST "scp /tmp/$WORKER $WORKER_USERNAME@$MACHINE:$WORKER_LOCATION" > /dev/null 2>&1
echo Starting worker on $MACHINE
- ssh $WORKER_USERNAME@$WORKER_RELAY_HOST ssh $WORKER_USERNAME@$MACHINE "WORKER_LOGGING_LEVEL=$WORKER_LOGGING_LEVEL $WORKER_WORK/$WORKER $EXECUTION_URL $MACHINE $WORKER_LOG_DIR" &
+ ssh $WORKER_USERNAME@$WORKER_RELAY_HOST ssh $WORKER_USERNAME@$MACHINE "WORKER_LOGGING_LEVEL=$WORKER_LOGGING_LEVEL $WORKER_LOCATION/$WORKER http://localhost:$PORT $MACHINE $WORKER_LOG_DIR" &
echo $! >> $PID_FILE
# Connect directly
- else
- scp $SWIFT_BIN/$WORKER $WORKER_USERNAME@$MACHINE:$WORKER_WORK > /dev/null 2>&1
+ else
+ ssh $WORKER_USERNAME@$MACHINE mkdir -p $WORKER_LOCATION > /dev/null 2>&1
+ scp $SWIFT_BIN/$WORKER $WORKER_USERNAME@$MACHINE:$WORKER_LOCATION > /dev/null 2>&1
echo Starting worker on $MACHINE
- ssh $WORKER_USERNAME@$MACHINE "$WORKER_WORK/$WORKER $EXECUTION_URL $MACHINE $LOG_DIR" &
+ ssh $WORKER_USERNAME@$MACHINE "$WORKER_LOCATION/$WORKER $EXECUTION_URL $MACHINE $LOG_DIR" &
echo $! >> $PID_FILE
fi
done
@@ -88,7 +244,7 @@
}
# Start local workers
-start-workers-local()
+start-workers-local()
{
PORT=$1
EXECUTION_URL=http://$IPADDR:$PORT
@@ -143,17 +299,24 @@
else
crash "Cannot find coaster-service.conf!"
fi
+cp $CONFIG_FILE $HOME/.swift/.config
+echo "Start-coaster-service..."
+echo "Configuration: $CONFIG_FILE"
+
source $CONFIG_FILE
-# Determine information needed about this machine
+# Determine IP address to which workers should connect
if [ -z "$IPADDR" ]; then
- if [ -x "/sbin/ifconfig" ]; then
+ if [ "$SSH_TUNNELING" == "yes" ]; then
+ IPADDR=localhost
+ elif [ -x "/sbin/ifconfig" ]; then
IPADDR=$( /sbin/ifconfig | grep 'inet addr' | grep -v 127.0.0.1 | cut -d ':' -f 2 | awk '{print $1}' |head -1)
else
crash "Unable to determine IP address of system. Please add to coaster-service.conf"
fi
fi
+echo Service address: $IPADDR
# Find swift
if [ ! -x "$SWIFT" ]; then
@@ -207,11 +370,11 @@
$SWIFT_BIN/coaster-service -nosec -portfile $SERVICE_PORT_FILE --localport $LOCAL_PORT -passive > $COASTER_LOG 2>&1 &
elif [ -n "$SERVICE_PORT" ] && [ -n "$LOCAL_PORT" ]; then
$SWIFT_BIN/coaster-service -nosec -port $SERVICE_PORT -localport $LOCAL_PORT -passive > $COASTER_LOG 2>&1 &
-else
+else
crash "Unknown SERVICE_PORT type specified!"
fi
-echo $! > $PID_FILE
+echo $! >> $PID_FILE
sleep 5
# Determine SERVICE_PORT
@@ -249,7 +412,13 @@
futuregrid)
start-workers-futuregrid $LOCAL_PORT
;;
- *)
+ gp)
+ start-workers-gp $LOCAL_PORT
+ ;;
+ ec2)
+ start-workers-ec2 $LOCAL_PORT
+ ;;
+ *)
crash "Unknown WORKER_MODE. Please modify coaster-service.conf"
;;
esac
@@ -260,7 +429,7 @@
if [ -f "gensites.template" ]; then
gensites `cat gensites.template` -p $CONFIG_FILE > $RUN_DIR/sites.xml
else
- gensites persistent-coasters -p $CONFIG_FILE > $RUN_DIR/sites.xml
+ gensites persistent-coasters -p $CONFIG_FILE > $RUN_DIR/sites.xml
fi
# Generate config file
@@ -271,6 +440,11 @@
wrapperlog.always.transfer=false
execution.retries=0
provider.staging.pin.swiftfiles=false
+sitedir.keep=false
EOF
fi
+# Local Variables:
+# tab-width: 3
+# sh-basic-offset: 3
+# End:
Modified: branches/release-0.93.1/bin/stop-coaster-service
===================================================================
--- branches/release-0.93.1/bin/stop-coaster-service 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/bin/stop-coaster-service 2012-01-22 03:23:13 UTC (rev 5505)
@@ -13,16 +13,7 @@
SWIFTVM_INSTANCES="$HOME/.swift/.swiftvm_instances"
# Import settings
-if [ -f "./coaster-service.conf" ]; then
- CONFIG_FILE="./coaster-service.conf"
-elif [ -f "$HOME/.swift/coaster-service.conf" ]; then
- CONFIG_FILE="$HOME/.swift/coaster-service.conf"
-elif [ -f "$(dirname $(readlink -f $0))/../etc/coaster-service.conf" ]; then
- CONFIG_FILE="$(dirname $(readlink -f $0))/../etc/coaster-service.conf"
-else
- crash "Cannot find coaster-service.conf!"
-fi
-
+CONFIG_FILE=$HOME/.swift/.config
source "$CONFIG_FILE"
echo Ending coaster processes..
@@ -32,22 +23,46 @@
#echo "$pid"
for i in `ps -ef| awk '$3 == '$pid' { print $2 }'`
do
- #echo "$i"
+ echo "Killing process $i"
kill $i > /dev/null 2>&1
done
kill $pid > /dev/null 2>&1
done
rm $PID_FILE > /dev/null 2>&1
fi
-echo Done
-if [ $WORKER_MODE == "futuregrid" ] && [ -f "$SWIFTVM_INSTANCES" ]; then
+if [ "$WORKER_MODE" == "futuregrid" ] && [ -f "$SWIFTVM_INSTANCES" ]; then
for INSTANCE in `cat $SWIFTVM_INSTANCES`
do
- $SWIFTVMBOOT_DIR/ve/bin/cloudinitd terminate $INSTANCE
+ $SWIFTVMBOOT_DIR/futuregrid/ve/bin/cloudinitd terminate $INSTANCE
done
rm $SWIFTVM_INSTANCES > /dev/null 2>&1
fi
+if [ "$WORKER_MODE" == "gp" ] && [ -f "$SWIFTVM_INSTANCES" ]; then
+ for INSTANCE in `cat $SWIFTVM_INSTANCES`
+ do
+ echo Stopping ec2 instance $INSTANCE...
+ $SWIFTVMBOOT_DIR/bin/gp-instance-terminate $INSTANCE | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"
+ done
+ rm $SWIFTVM_INSTANCES > /dev/null 2>&1
+fi
+
+if [ "$WORKER_MODE" == "ec2" ] && [ -f "$SWIFTVM_INSTANCES" ]; then
+ export EC2_HOME="$SWIFTVMBOOT_DIR/ec2"
+ export EC2_PRIVATE_KEY="$EC2_KEYFILE"
+ export EC2_CERT="$EC2_CERTFILE"
+ INSTANCES_AS_STRING=$( cat $SWIFTVM_INSTANCES | tr "\\n" " ")
+ $SWIFTVMBOOT_DIR/ec2/bin/ec2-terminate-instances $INSTANCES_AS_STRING
+ if [ -f "$HOME/.swift/.swiftvm_instances" ]; then
+ rm $HOME/.swift/.swiftvm_instances
+ fi
+fi
+
+if [ -f "$HOME/.swift/machines" ]; then
+ rm "$HOME/.swift/machines"
+fi
+
popd > /dev/null 2>&1
+echo Done
Modified: branches/release-0.93.1/bin/swift
===================================================================
--- branches/release-0.93.1/bin/swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/bin/swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -86,6 +86,7 @@
updateOptions "$X509_USER_PROXY" "X509_USER_PROXY"
updateOptions "$SWIFT_HOME" "COG_INSTALL_PATH"
updateOptions "$SWIFT_HOME" "swift.home"
+updateOptions "$SWIFT_USERHOME" "user.home"
#Use /dev/urandom instead of /dev/random for seeding RNGs
#This will lower the randomness of the seed, but avoid
#large delays if /dev/random does not have enough entropy collected
Modified: branches/release-0.93.1/docs/build_docs.sh
===================================================================
--- branches/release-0.93.1/docs/build_docs.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/docs/build_docs.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -40,12 +40,32 @@
do
pushd $directory > /dev/null 2>&1
FILES=`ls -1 *.txt 2>/dev/null`
+ CONTENTFILES=`find . -maxdepth 1 -type f ! -iname *.pdf`
+
for file in $FILES
do
- echo Converting $directory"$file" to HTML
- asciidoc -a toc -a max-width=750px -a stylesheet=$(pwd)/../stylesheets/asciidoc.css $file
- echo Converting $directory"$file" to PDF
- a2x --format=pdf --no-xmllint $file
+ doflag=0
+ for contentfile in $CONTENTFILES
+ do
+ diff $contentfile .cache/$contentfile >/dev/null 2>/dev/null
+ if [ $? -ne 0 ]
+ then
+ doflag=1
+ fi
+ done
+ if [ $doflag -eq 1 ]
+ then
+ echo "updating cache"
+ for newcontent in $CONTENTFILES
+ do
+ cp $newcontent .cache/
+ done
+ echo Converting $directory"$file" to HTML
+ asciidoc -a toc -a max-width=750px -a stylesheet=$(pwd)/../stylesheets/asciidoc.css $file
+ echo Converting $directory"$file" to PDF
+ a2x --format=pdf --no-xmllint $file
+ fi
+ #fi
done
if [ ! -d "$INSTALLATION_DIRECTORY/$VERSION" ]; then
Deleted: branches/release-0.93.1/docs/cookbook/.cache/cookbook.txt
===================================================================
--- branches/release-0.93/docs/cookbook/.cache/cookbook.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/docs/cookbook/.cache/cookbook.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,16 +0,0 @@
-Swift Cookbook
-==============
-Swift team <swift-user at ci.uchicago.edu>
-v0.92, March 2011
-
-include::overview[]
-
-include::swift_basics[]
-
-include::coasters[]
-
-include::diverse_infrastructures[]
-
-include::debugging_swift[]
-
-include::log_processing[]
Copied: branches/release-0.93.1/docs/cookbook/.cache/cookbook.txt (from rev 5504, branches/release-0.93/docs/cookbook/.cache/cookbook.txt)
===================================================================
--- branches/release-0.93.1/docs/cookbook/.cache/cookbook.txt (rev 0)
+++ branches/release-0.93.1/docs/cookbook/.cache/cookbook.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,16 @@
+Swift Cookbook
+==============
+Swift team <swift-user at ci.uchicago.edu>
+v0.92, March 2011
+
+include::overview[]
+
+include::swift_basics[]
+
+include::coasters[]
+
+include::diverse_infrastructures[]
+
+include::debugging_swift[]
+
+include::log_processing[]
Deleted: branches/release-0.93.1/docs/documentation/.cache/documentation.txt
===================================================================
--- branches/release-0.93/docs/documentation/.cache/documentation.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/docs/documentation/.cache/documentation.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,11 +0,0 @@
-Swift Document Generation
-=========================
-
-include::overview[]
-
-include::structure[]
-
-include::building[]
-
-include::automation[]
-
Copied: branches/release-0.93.1/docs/documentation/.cache/documentation.txt (from rev 5504, branches/release-0.93/docs/documentation/.cache/documentation.txt)
===================================================================
--- branches/release-0.93.1/docs/documentation/.cache/documentation.txt (rev 0)
+++ branches/release-0.93.1/docs/documentation/.cache/documentation.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,11 @@
+Swift Document Generation
+=========================
+
+include::overview[]
+
+include::structure[]
+
+include::building[]
+
+include::automation[]
+
Deleted: branches/release-0.93.1/docs/quickstart/.cache/quickstart.txt
===================================================================
--- branches/release-0.93/docs/quickstart/.cache/quickstart.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/docs/quickstart/.cache/quickstart.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,101 +0,0 @@
-Swift Quickstart
-================
-
-[abstract]
-Abstract
---------
-This guide describes the steps needed to download, install, configure,
-and run the basic examples for Swift. If you are using a pre-installed
-version of Swift, you can skip directly to the configuration section.
-
-Stable Releases vs. Development Releases
-----------------------------------------
-Stable releases of Swift have undergone more extensive testing than development releases.
-In general, they are more stable, have fewer bugs, and have been tested on a variety of
-systems.
-
-The development version of Swift is aimed at developers and testers. The development
-code has the highest chance of containing buggy and untested code. If you need stability
-please use the latest stable release.
-
-Downloading a Swift Distribution
---------------------------------
-There are two main ways of getting the Swift implementation: binary
-releases and the source repository.
-
-Binary Releases
-~~~~~~~~~~~~~~~
-For the majority of users, downloading and installing binary releases is recommended.
-Since Swift is written in Java, the binary packages will run on all supported platforms with
-Java Runtime Environment 1.5 or greater. Binary releases can be obtained from the
-http://www.ci.uchicago.edu/swift/downloads/index.php[Swift downloads page].
-
-Once downloaded, simply unpack the downloaded package (swift-<version>.tar.gz) into a
-directory of your choice:
-
------
-tar -xzvf swift-<version>.tar.gz
------
-
-This will create a swift-<version> directory containing the build.
-
-Source Repository
-~~~~~~~~~~~~~~~~~
-The source code for Swift is available to developers who have an interest in contributing
-new features. To build Swift from source code, you will need http://ant.apache.org/[Apache Ant]
-and http://www.oracle.com/technetwork/java/javase/downloads/index.html[Java JDK]. Once
-built, the dist/swift-svn directory will contain your build.
-
-To download and build Swift 0.93, follow these instructions:
------
-$ mkdir swift-0.93
-$ cd swift-0.93
-$ svn co https://cogkit.svn.sourceforge.net/svnroot/cogkit/branches/4.1.9/src/cog
-$ cd cog/modules
-$ svn co https://svn.ci.uchicago.edu/svn/vdl2/branches/release-0.93 swift
-$ cd swift
-$ ant redist
------
-
-Setting your PATH
------------------
-Once Swift is installed, it is useful to add the swift binary to your PATH
-environment variable. To do this, first determine where the Swift bin
-directory is located. If you installed Swift from a binary release, it will
-be in the swift-0.93/bin directory where you installed it. If you followed
-the instructions above for installing Swift from a source repository, it
-will be located in swift-0.93/cog/modules/swift/dist/swift-svn/bin.
-
-Add the following line to the bottom of ~/.bashrc:
-
------
-export PATH=$PATH:/full/path/to/swift
------
-
-When you login, test this out by typing the command
------
-$ which swift
------
-
-This should point you to the path of the Swift binary.
-
-Running Swift Examples
-----------------------
-The Swift examples can be found in the examples directory in the Swift
-distribution. The examples are written in the SwiftScript language, and
-have .swift as a file extension.
-
-Execution of a Swift workflow is done using the swift command, which
-takes the Swift workflow file name as an argument:
-
------
-cd examples/tutorial
-swift hello.swift
------
-
-When you run this application, it should create a file called hello.txt.
-If this file gets created, you have successfully ran your first
-Swift script!
-
-More documentation on how to run Swift can be found at
-http://www.ci.uchicago.edu/swift/docs/index.php,
Copied: branches/release-0.93.1/docs/quickstart/.cache/quickstart.txt (from rev 5504, branches/release-0.93/docs/quickstart/.cache/quickstart.txt)
===================================================================
--- branches/release-0.93.1/docs/quickstart/.cache/quickstart.txt (rev 0)
+++ branches/release-0.93.1/docs/quickstart/.cache/quickstart.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,101 @@
+Swift Quickstart
+================
+
+[abstract]
+Abstract
+--------
+This guide describes the steps needed to download, install, configure,
+and run the basic examples for Swift. If you are using a pre-installed
+version of Swift, you can skip directly to the configuration section.
+
+Stable Releases vs. Development Releases
+----------------------------------------
+Stable releases of Swift have undergone more extensive testing than development releases.
+In general, they are more stable, have fewer bugs, and have been tested on a variety of
+systems.
+
+The development version of Swift is aimed at developers and testers. The development
+code has the highest chance of containing buggy and untested code. If you need stability
+please use the latest stable release.
+
+Downloading a Swift Distribution
+--------------------------------
+There are two main ways of getting the Swift implementation: binary
+releases and the source repository.
+
+Binary Releases
+~~~~~~~~~~~~~~~
+For the majority of users, downloading and installing binary releases is recommended.
+Since Swift is written in Java, the binary packages will run on all supported platforms with
+Java Runtime Environment 1.5 or greater. Binary releases can be obtained from the
+http://www.ci.uchicago.edu/swift/downloads/index.php[Swift downloads page].
+
+Once downloaded, simply unpack the downloaded package (swift-<version>.tar.gz) into a
+directory of your choice:
+
+-----
+tar -xzvf swift-<version>.tar.gz
+-----
+
+This will create a swift-<version> directory containing the build.
+
+Source Repository
+~~~~~~~~~~~~~~~~~
+The source code for Swift is available to developers who have an interest in contributing
+new features. To build Swift from source code, you will need http://ant.apache.org/[Apache Ant]
+and http://www.oracle.com/technetwork/java/javase/downloads/index.html[Java JDK]. Once
+built, the dist/swift-svn directory will contain your build.
+
+To download and build Swift 0.93, follow these instructions:
+-----
+$ mkdir swift-0.93
+$ cd swift-0.93
+$ svn co https://cogkit.svn.sourceforge.net/svnroot/cogkit/branches/4.1.9/src/cog
+$ cd cog/modules
+$ svn co https://svn.ci.uchicago.edu/svn/vdl2/branches/release-0.93 swift
+$ cd swift
+$ ant redist
+-----
+
+Setting your PATH
+-----------------
+Once Swift is installed, it is useful to add the swift binary to your PATH
+environment variable. To do this, first determine where the Swift bin
+directory is located. If you installed Swift from a binary release, it will
+be in the swift-0.93/bin directory where you installed it. If you followed
+the instructions above for installing Swift from a source repository, it
+will be located in swift-0.93/cog/modules/swift/dist/swift-svn/bin.
+
+Add the following line to the bottom of ~/.bashrc:
+
+-----
+export PATH=$PATH:/full/path/to/swift
+-----
+
+When you login, test this out by typing the command
+-----
+$ which swift
+-----
+
+This should point you to the path of the Swift binary.
+
+Running Swift Examples
+----------------------
+The Swift examples can be found in the examples directory in the Swift
+distribution. The examples are written in the SwiftScript language, and
+have .swift as a file extension.
+
+Execution of a Swift workflow is done using the swift command, which
+takes the Swift workflow file name as an argument:
+
+-----
+cd examples/tutorial
+swift hello.swift
+-----
+
+When you run this application, it should create a file called hello.txt.
+If this file gets created, you have successfully ran your first
+Swift script!
+
+More documentation on how to run Swift can be found at
+http://www.ci.uchicago.edu/swift/docs/index.php,
Deleted: branches/release-0.93.1/docs/siteguide/.cache/siteguide.txt
===================================================================
--- branches/release-0.93/docs/siteguide/.cache/siteguide.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/docs/siteguide/.cache/siteguide.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,24 +0,0 @@
-Site Configuration Guide
-========================
-
-:toc:
-:icons:
-:website: http://www.ci.uchicago.edu/swift/guides/siteguide.php
-:numbered:
-
-include::prereqs[]
-
-include::bag_of_workstations[]
-
-include::beagle[]
-
-include::fusion[]
-
-include::futuregrid[]
-
-include::intrepid[]
-
-include::mcs[]
-
-include::pads[]
-
Copied: branches/release-0.93.1/docs/siteguide/.cache/siteguide.txt (from rev 5504, branches/release-0.93/docs/siteguide/.cache/siteguide.txt)
===================================================================
--- branches/release-0.93.1/docs/siteguide/.cache/siteguide.txt (rev 0)
+++ branches/release-0.93.1/docs/siteguide/.cache/siteguide.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,24 @@
+Site Configuration Guide
+========================
+
+:toc:
+:icons:
+:website: http://www.ci.uchicago.edu/swift/guides/siteguide.php
+:numbered:
+
+include::prereqs[]
+
+include::bag_of_workstations[]
+
+include::beagle[]
+
+include::fusion[]
+
+include::futuregrid[]
+
+include::intrepid[]
+
+include::mcs[]
+
+include::pads[]
+
Copied: branches/release-0.93.1/docs/siteguide/bag_of_workstations (from rev 5504, branches/release-0.93/docs/siteguide/bag_of_workstations)
===================================================================
--- branches/release-0.93.1/docs/siteguide/bag_of_workstations (rev 0)
+++ branches/release-0.93.1/docs/siteguide/bag_of_workstations 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,109 @@
+Bag of Workstations
+-------------------
+"Bag of workstations" refers to a collection of machines that are not connected
+together as part of a cluster or supercomputer.
+
+Prerequisites
+~~~~~~~~~~~~~
+In order to run Swift on a bag of workstations, the following prerequisites must
+be met:
+
+- The machines must be running Linux
+- The machines must have Perl available
+- A user account must be created on each machine (the username you create must be the same on each machine)
+- You must be able to SSH into the accounts without being prompted for a password. This usually involves creating an SSH key and setting up your authorized_keys. More information on how to do this can be found at http://www.openssh.org.
+
+Create a coaster-service.conf
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+To begin, copy the text below and paste it into the directory
+where your swift script is located. Name this file coaster-service.conf.
+
+-----
+include::../../etc/coaster-service.conf[]
+-----
+
+Modify coaster-service.conf
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The coaster-service.conf file contains information about your setup.
+There are a few settings you must customize.
+
+The first is the name of the machines which will be used as workers. Modify
+the line below to reflect the names of the machines you want to use.
+-----
+export WORKER_HOSTS="myhost1.mydomain myhost2.mydomain"
+-----
+
+Update the value for JOBS_PER_NODE to reflect the number of CPUs available per node.
+
+The JOB_THROTTLE setting determines the maximum number of active jobs. Use the formula
+to determine the ideal value:
+
+jobs per node * number of nodes - 0.1 / 100
+
+Example: Suppose you have 10 machines each with 8 cores
+-----
+8 jobs per node * 10 cores = 80
+80 - 0.1 = 79.9
+79.9 / 100 = 0.799
+-----
+
+In this example, you would set the job throttle to 0.799
+-----
+export JOB_THROTTLE=0.799
+-----
+
+By default, this setup assumes there are no firewall rescrictions. If there
+is a firewall rescricting SSH access, set tunneling to true with this command
+
+-----
+export SSH_TUNNELING=yes
+-----
+
+This setup also assumes that these machines are not using a shared filesystem (NFS/AFS/CIFS, etc).
+If these systems are all sharing a common filesystem, add the setting below.
+
+-----
+export SHARED_FILESYSTEM=no
+-----
+
+Starting the Coaster Service
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Change directories to the location where you would like to run a
+Swift script and start the coaster service with this
+command:
+
+-----
+start-coaster-service
+-----
+
+This will create a configuration file that Swift needs
+called sites.xml.
+
+WARNING: Any existing sites.xml files in this directory
+will be overwritten. Be sure to make a copy of any
+custom configuration files you may have.
+
+Run Swift
+~~~~~~~~~
+
+Next, run Swift. If you do not have a particular script
+in mind, you can test Swift by using a Swift script in
+the examples/ directory.
+
+Run the following command to run the script:
+-----
+swift -sites.file sites.xml -tc.file tc.data yourscript.swift
+-----
+
+Stopping the Coaster Service
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The coaster service will run indefinitely. The stop-coaster-service
+script will terminate the coaster service.
+
+-----
+$ stop-coaster-service
+-----
+
+This will kill the coaster service and kill the worker scripts on remote systems.
+
Modified: branches/release-0.93.1/docs/siteguide/beagle
===================================================================
--- branches/release-0.93.1/docs/siteguide/beagle 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/docs/siteguide/beagle 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,6 +1,10 @@
Beagle
------
+Introduction
+~~~~~~~~~~~~
+Beagle is a Cray XE6 supercomputer at UChicago. It employs a batch-oriented computational model where-in a PBS schedular accepts user's jobs and queues them in the queueing system for execution. The computational model requires a user to prepare the submit files, track job submissions, chackpointing, managing input/output data and handling exceptional conditions manually. Running Swift under Beagle can accomplish the above tasks with least manual user intervention and maximal oppurtunistic computation time on Beagle queues. In the following sections, we discuss more about specifics of running Swift on Beagle. A more detailed information about Swift and its workings can be found on Swift documentation page here: http://www.ci.uchicago.edu/swift/wwwdev/docs/index.php . More information on Beagle can be found on UChicago Beagle website here: http://beagle.ci.uchicago.edu .
+
Requesting Access
~~~~~~~~~~~~~~~~~
If you do not already have a Computation Institute account, you can request
@@ -15,9 +19,15 @@
node with the following command:
-----
-ssh yourusername at login.beagle.ci.uchicago.edu
+ssh -l username login.beagle.ci.uchicago.edu -A
-----
+or to log on to the sandbox:
+
+-----
+ssh -l username sandbox.beagle.ci.uchicago.edu -A
+-----
+
Follow the steps outlined below to get started with Swift on Beagle:
*step 1.* Load the Swift module on Beagle as follows: +module load swift+
@@ -26,26 +36,97 @@
stay. (say, +mkdir swift-lab+, followed by, +cd swift-lab+)
*step 3.* To get started with a simple example running +/bin/cat+ to read an
-input file +data.txt+ and write to an output file +f.nnn.out+, copy the folder
-at +/home/ketan/catsn+ to the above directory. (+cp -r /home/ketan/catsn
-.+ followed by +cd catsn+).
+input file +data.txt+ and write to an output file +f.nnn.out+, start with writing a simple swift source script as follows:
-*step 4.* In the sites file: +beagle-coaster.xml+, make the following two
-changes: *1)* change the path of +workdirectory+ to your preferred location
-(say to +/lustre/beagle/$USER/swift-lab/swift.workdir+) and *2)* Change the
-project name to your project (+CI-CCR000013+) . The workdirectory will contain
-execution data related to each run, e.g. wrapper scripts, system information,
-inputs and outputs.
+-----
+type file;
-*step 5.* Run the example using following commandline (also found in run.sh):
-+swift -config cf -tc.file tc -sites.file beagle-coaster.xml catsn.swift -n=1+
-. You can further change the value of +-n+ to any arbitrary number to run that
-many number of concurrent +cat+
+/* App definitio */
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
-*step 6.* Check the output in the generated +outdir+ directory (+ls outdir+)
+file out[]<simple_mapper; location="outdir", prefix="f.",suffix=".out">;
+file data<"data.txt">;
+/* App invocation: n times */
+foreach j in [1:@toint(@arg("n","1"))] {
+ out[j] = cat(data);
+}
+-----
+
+*step 4.* The next step is to create a sites file. An example sites file (sites.xml) is shown as follows:
+
+-----
+<config>
+ <pool handle="pbs">
+ <execution provider="coaster" jobmanager="local:pbs"/>
+ <!-- replace with your project -->
+ <profile namespace="globus" key="project">CI-CCR000013</profile>
+
+ <profile namespace="globus" key="providerAttributes">
+ pbs.aprun;pbs.mpp;depth=24</profile>
+
+ <profile namespace="globus" key="jobsPerNode">24</profile>
+ <profile namespace="globus" key="maxTime">1000</profile>
+ <profile namespace="globus" key="slots">1</profile>
+ <profile namespace="globus" key="nodeGranularity">1</profile>
+ <profile namespace="globus" key="maxNodes">1</profile>
+
+ <profile namespace="karajan" key="jobThrottle">.63</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+
+ <filesystem provider="local"/>
+ <!-- replace this with your home on lustre -->
+ <workdirectory >/lustre/beagle/ketan/swift.workdir</workdirectory>
+ </pool>
+</config>
+-----
+
+*step 5.* In this step, we will see the config and tc files. The config file (cf) is as follows:
+
+-----
+wrapperlog.always.transfer=true
+sitedir.keep=true
+execution.retries=1
+lazy.errors=true
+use.provider.staging=true
+provider.staging.pin.swiftfiles=false
+foreach.max.threads=100
+provenance.log=false
+-----
+
+The tc file (tc) is as follows:
+
+-----
+pbs cat /bin/cat null null null
+-----
+
+More about config and tc file options can be found in the swift userguide here: http://www.ci.uchicago.edu/swift/wwwdev/guides/release-0.93/userguide/userguide.html#_swift_configuration_properties.
+
+*step 6.* Run the example using following commandline:
+
+-----
+swift -config cf -tc.file tc -sites.file sites.xml catsn.swift -n=1
+-----
+
+You can further change the value of +-n+ to any arbitrary number to run that
+many number of concurrent +cat+ tasks.
+
+*step 7.* Swift will show a status message as "done" after the job has completed its run in the queue. Check the output in the generated +outdir+ directory (+ls outdir+)
+
+----
+Swift 0.93RC5 swift-r5285 cog-r3322
+
+RunID: 20111218-0246-6ai8g7f0
+Progress: time: Sun, 18 Dec 2011 02:46:33 +0000
+Progress: time: Sun, 18 Dec 2011 02:46:42 +0000 Active:1
+Final status: time: Sun, 18 Dec 2011 02:46:43 +0000 Finished successfully:1
+----
+
Note: Running from sandbox node or requesting 30 minutes walltime for upto 3 nodes
-will get fast prioritized execution. Good for small tests.
+will get fast prioritized execution. Suitable for small tests.
Larger Runs on Beagle
~~~~~~~~~~~~~~~~~~~~~
@@ -53,13 +134,13 @@
The following sites.xml parameters must be set to scale that is intended for a large run:
* *maxTime* : The expected walltime for completion of your run. This parameter is accepted in seconds.
- * *slots* : This parameter specifies the maximum number of jobs/blocks that the coaster scheduler will have running at any given time. On Beagle, this number will determine how many qsubs swift will submit for your run. Typical values range between 40 and 60 for large runs.
+ * *slots* : This parameter specifies the maximum number of pbs jobs/blocks that the coaster scheduler will have running at any given time. On Beagle, this number will determine how many qsubs swift will submit for your run. Typical values range between 40 and 60 for large runs.
* *nodeGranularity* : Determines the number of nodes per job. It restricts the number of nodes in a job to a multiple of this value. The total number of workers will then be a multiple of jobsPerNode * nodeGranularity. For Beagle, jobsPerNode value is 24 corresponding to its 24 cores per node.
* *maxNodes* : Determines the maximum number of nodes a job must pack into its qsub. This parameter determines the largest single job that your run will submit.
* *jobThrottle* : A factor that determines the number of tasks dispatched simultaneously. The intended number of simultaneous tasks must match the number of cores targeted. The number of tasks is calculated from the jobThrottle factor is as follows:
----
-Number of Tasks = (JobThrottle x 100) + 1
+Number of parallel Tasks = (JobThrottle x 100) + 1
----
Following is an example sites.xml for a 50 slots run with each slot occupying 4 nodes (thus, a 200 node run):
@@ -91,3 +172,97 @@
</config>
-----
+Resuming Large Runs
+~~~~~~~~~~~~~~~~~~~
+Oftentimes, the application runs with a large number of tasks needed to be resumed after they have run to a certain point. The reasons for resume could be among others, application error, trainsient errors such as Beagle's availability or accidental shutdowns of the runs. In such cases, the *resume* feature of Swift is very handy. Resume starts the run from the point it left of. One can resume a stopped run using the same swift commandline plus adding the option -resume followed by a resume log (extension .rlog) that is created by Swift in your run directory. An example of such a resume follows:
+
+-----
+$ swift -resume catsn-ht0adgi315l61.0.rlog <other options> catsn.swift
+-----
+
+Troubleshooting
+~~~~~~~~~~~~~~~
+
+In this section we will discuss some of the common issues and remedies while using Swift on Beagle. The origin of these issues can be Swift or the Beagle's configuration, state and user configuration among other factors. We try to identify maximum known issues and address them here:
+
+* Command not found: Swift is installed on Beagle as a module. If you see the following error message:
+
+-----
+If 'swift' is not a typo you can run the following command to lookup the
+package that contains the binary:
+ command-not-found swift
+-bash: swift: command not found
+-----
+
+The most likely cause is the Swift module is not loaded. Do the following to load the Swift module:
+
+-----
+$ module load swift
+Swift version swift-0.93RC5 loaded
+-----
+
+* Failed to transfer *wrapperlog* for job cat-nmobtbkk and/or Job failed with an exit code of 254. This is a most likely symptom of compute node trying to write to a non-writable filesystem. Check the <workdirectory> element on the sites.xml file.
+
+-----
+<workdirectory >/home/ketan/swift.workdir</workdirectory>
+-----
+
+It is likely that it is set to a path where the compute nodes can not write, e.g. your /home directory. The remedy for this error is to set your workdirectory to the /lustre path where swift could write from compute nodes.
+
+-----
+<workdirectory >/lustre/beagle/ketan/swift.workdir</workdirectory>
+-----
+
+* Out of heap space error is a typical error that you get when running large number of tasks in parallel from a submit host such as Beagle login nodes.
+
+-----
+java.lang.OutOfMemoryError: Java heap space
+-----
+
+A simple solution to this problem is to increase the java heap space. This can be solved by increasing the heap space Swift gets by the following environment variable:
+
+-----
+SWIFT_HEAP_MAX=5000M swift -config cf -tc.file tc -sites.file sites.xml catsn.swift -n=10000
+-----
+
+* Application invocation fails or application returns a non-zero exit status. An application invocation might fail for a variety of reasons. Some of the common reasons include a faulty command line, out-of-memory, non-availability of data, library dependencies unmet, among others. In another set of failures, the application invocation might fail for a partial number of datasets. In these conditions, one might want to to continue for the rest of application invocations. In most cases, these conditions could be handled by catching various exitcodes and logging the erroneous invocations for later inspection. In the rest of this section, we provide some such examples.
+ - Handling exitcodes in wrapperscript. The following code snippet from an application, handles the erroneous exitcode so that the erroneous runs could be logged and dealt with later:
+
+----
+call_to_app $1 $2
+if [ "$exit_status" -ne 0 ]; then
+ echo $2 | awk '{ print $1 }' >> /lustre/beagle/ketan/App_FailedList.txt
+fi
+----
+
+- Advanced Handling of Out of Memory (OOM) Conditions. The following code snippet handles a case of OOM error conditions by monitoring the available memory at each invocation:
+
+----
+# if mem is low, wait for it to recover before starting
+for i in $(seq 0 $maxtries); do
+ freeMB=$(free -m | grep cache: | awk '{print $4}')
+ if [ $freeMB -lt $lowmem ]; then
+ if [ $i = $maxtries ]; then
+ echo "$host $(date) freeMB = $freeMB below yellow mark $lowmem after $maxtries \
+ $startsleep sec pauses. Exiting." >>$oomlog
+ exit 7
+ else
+ echo "$host $(date) freeMB = $freeMB below yellow mark $lowmem on try $i. Sleeping \
+ $startsleep sec." >>$oomlog
+ sleep $startsleep
+ fi
+ else
+ break
+ fi
+done
+
+app_invocation $args
+----
+
+More Help
+~~~~~~~~
+
+If the error messages you get does not give much clue, you can go about one of the following approaches to find more help:
+ - Search for the particular error message on the swift mailing list archive from here: http://www.ci.uchicago.edu/swift/wwwdev/support/index.php. It is likely someone has encountered the issue before and there is a ready remedy posted by one of the Swift team members.
+ - Subscribe to the swift-user lists and post your questions here: https://lists.ci.uchicago.edu/cgi-bin/mailman/listinfo/swift-user. Please attach the Swift-generated log file and the sites file with your question.
+
Modified: branches/release-0.93.1/docs/siteguide/fusion
===================================================================
--- branches/release-0.93.1/docs/siteguide/fusion 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/docs/siteguide/fusion 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,13 +1,49 @@
Fusion
-----
+------
+Fusion is a 320-node computing cluster for the Argonne
+National Laboratory community. The primary goal of the LCRC is to
+facilitate mid-range computing in all of the scientific programs of
+Argonne and the University of Chicago.
-Fusion Quickstart
-~~~~~~~~~~~~~~~
This section will walk you through running a simple Swift script
on Fusion.
+Requesting Access
+~~~~~~~~~~~~~~~~~
+If you do not already have a Fusion account, you can request one at
+https://accounts.lcrc.anl.gov/request.php. Email support at lcrc.anl.gov
+for additional help.
+
+Projects
+~~~~~~~~
+In order to run a job on a Fusion compute node, you must first be associated
+with a project.
+
+Each project has one or more Primary Investigators, or PIs. These PIs are
+responsible for adding and removing users to a project. Contact the PI of
+your project to be added.
+
+More information on this process can be found at
+http://www.lcrc.anl.gov/info/Projects.
+
+SSH Keys
+~~~~~~~~
+Before accessing Fusion, be sure to have your SSH keys configured correctly.
+SSH keys are required to access fusion. You should see information about
+this when you request your account. Email support at lcrc.anl.gov for
+additional help.
+
+Connecting to a login node
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+Once your keys are configured, you should be able to access a Fusion login
+node with the following command:
+
+-----
+ssh yourusername at fusion.lcrc.anl.gov
+-----
+
Creating sites.xml
-^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~
Swift relies on various configuration files to determine how to
run. This section will provide a working configuration file which
you can copy and paste to get running quickly. The sites.xml file
@@ -29,7 +65,7 @@
-----
Creating tc.data
-^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~
The tc.data configuration file gives information about the applications
that will be called by Swift. More information about the format
of tc.data can be found in the Swift User's guide.
@@ -41,8 +77,7 @@
-----
Copy a Swift Script
-^^^^^^^^^^^^^^^^^^^
-
+~~~~~~~~~~~~~~~~~~~~
Within the Swift directory is an examples directory which contains
several introductory Swift scripts. The example we will use in this
section is called catsn.swift. Copy this script to the same directory
@@ -55,8 +90,7 @@
TIP: The location of your swift directory may vary depending on how you installed it. Change this to the examples/misc directory of your installation as needed.
Run Swift
-^^^^^^^^^
-
+~~~~~~~~~
Finally, run the script
-----
$ swift -sites.file sites.xml -tc.file tc.data catsn.swift
@@ -65,40 +99,6 @@
You should see 10 new text files get created, named catsn*.out. If
you see these files, then you have succesfully run Swift on Fusion!
-Requesting Access
-~~~~~~~~~~~~~~~~~
-If you do not already have a Fusion account, you can request one at
-https://accounts.lcrc.anl.gov/request.php. Email support at lcrc.anl.gov
-for additional help.
-
-SSH Keys
-~~~~~~~~
-Before accessing Fusion, be sure to have your SSH keys configured correctly.
-SSH keys are required to access fusion. You should see information about
-this when you request your account. Email support at lcrc.anl.gov for
-additional help.
-
-Connecting to a login node
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-Once your keys are configured, you should be able to access a Fusion login
-node with the following command:
-
------
-ssh yourusername at fusion.lcrc.anl.gov
------
-
-Projects
-~~~~~~~~
-In order to run a job on a Fusion compute node, you must first be associated
-with a project.
-
-Each project has one or more Primary Investigators, or PIs. These PIs are
-responsible for adding and removing users to a project. Contact the PI of
-your project to be added.
-
-More information on this process can be found at
-http://www.lcrc.anl.gov/info/Projects.
-
Queues
~~~~~~
Fusion has two queues: shared and batch. The shared queue has a maximum 1
Modified: branches/release-0.93.1/docs/siteguide/futuregrid
===================================================================
--- branches/release-0.93.1/docs/siteguide/futuregrid 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/docs/siteguide/futuregrid 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,26 +1,11 @@
Futuregrid Quickstart Guide
---------------------------
+FutureGrid is a distributed, high-performance test-bed that allows
+scientists to collaboratively develop and test innovative approaches
+to parallel, grid, and cloud computing.
-Downloading and Building Swift
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The most recent versions of Swift can be found at
-http://www.ci.uchicago.edu/swift/downloads/index.php. To run on futuregrid,
-you will need to use Swift 0.93 or later.
+More information on futuregrid can be found at https://portal.futuregrid.org/.
-Adding Swift to your PATH
-~~~~~~~~~~~~~~~~~~~~~~~~~
-Once you have installed Swift, add the Swift binary to your PATH so you can
-easily run it from any directory.
-
-In your home directory, edit the file ".bashrc".
-
-If you have installed Swift via a source repository, add the following line
-at the bottom of .bashrc.
-
------
-export PATH=$PATH:$HOME/cog/modules/swift/dist/swift-svn/bin
------
-
Requesting Futuregrid Access
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
If you do not already have a futuregrid account, you can follow the
@@ -51,45 +36,57 @@
called vws.repository.s3id and vws.repository.s3key. Copy these
values for the next step.
-Configuring Swift VM Tools
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-Change directories into the swift-vm-boot directory. Edit the file
-called env.sh. There are two settings here that you will need to
-modify: FUTUREGRID_IAAS_ACCESS_KEY and FUTUREGRID_IAAS_SECRET_KEY.
-Paste your access key (s3id) and secret key (s3key) here and save
-the file. By default, env.sh requests 2 nodes on hotel and 2 nodes
-on sierra. Change these values as needed. Run install.sh from the
-swift-vm-boot directory to complete the installation of Swift VM
-Tools. The Swift VM Tools may require a fairly recent version of
-Python. If you run into problems while running the install.sh
-script, please try a more recent version of Python and associated
-libraries.
-
Configuring coaster-service.conf
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Within your swift distribution's etc directory is a file called
-coaster-service.conf. There are many options here you can modify
-as needed, but these are the settings that will be required
-to run on futuregrid:
+To run on futuregrid, you will need a file called coaster-service.conf.
+This file contains many options to control how things run. Here is
+an example of a working coaster-service.conf on futuregrid.
-----
-export WORKER_WORK=/tmp
+# Where to copy worker.pl on the remote machine for sites.xml
+export WORKER_LOCATION=/tmp
+
+# How to launch workers: local, ssh, cobalt, or futuregrid
export WORKER_MODE=futuregrid
+
+# Do all the worker nodes you're using have a shared filesystem? (yes/no)
export SHARED_FILESYSTEM=no
+
+# Username to use on worker nodes
export WORKER_USERNAME=root
+
+# Enable SSH tunneling? (yes/no)
export SSH_TUNNELING=yes
+
+# Directory to keep log files, relative to working directory when launching start-coaster-service
+export LOG_DIR=logs
+
+# Location of the swift-vm-boot scripts
export SWIFTVMBOOT_DIR=$HOME/swift-vm-boot
+
+# Futuregrid settings
+export FUTUREGRID_IAAS_ACCESS_KEY=XXXXXXXXXXXXXXXXXXXXX
+export FUTUREGRID_IAAS_SECRET_KEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+export FUTUREGRID_HOTEL_NODES=0
+export FUTUREGRID_SIERRA_NODES=2
+export FUTUREGRID_CPUS_PER_NODE=1
+
+# Swift information for creating sites.xml
export WORK=/tmp
+export JOBS_PER_NODE=$FUTUREGRID_CPUS_PER_NODE
+export JOB_THROTTLE=$( echo "scale=5; ($JOBS_PER_NODE * $(($FUTUREGRID_HOTEL_NODES + $FUTUREGRID_SIERRA_NODES)))/100 - 0.00001"|bc )
+
+# Application locations for tc.data
+#app convert=/usr/bin/convert
-----
-These is a brief description of these settings in the coaster-service.conf file.
-Tunneling should be used when you are restricted by a firewall. If your local
-machine has multiple network interfaces, you should also manually set the IP
-address of your machine with export IPADDR=your.ip.address.here.
+Paste your credentials from the hotel.conf file into the FUTUREGRID_IAAS_ACCESS_KEY and FUTUREGRID_IAAS_SECRET_KEY fields.
+Adjust the number of nodes you would like to allocate here by changing the values of FUTUREGRID_HOTEL_NODES and FUTUREGRID_SIERRA_NODES.
+Add a list of any applications you want to run in the format "#app myapp=/path/to/app".
Starting the Coaster Service Script
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Now that everything is configured, change to a temporary directory
+Now that everything is configured, change to the location of the coaster-service.conf file
and run this command to start the coaster service:
-----
Modified: branches/release-0.93.1/docs/siteguide/intrepid
===================================================================
--- branches/release-0.93.1/docs/siteguide/intrepid 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/docs/siteguide/intrepid 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,5 +1,8 @@
Intrepid
--------
+Intrepid is an IBM Blue Gene/P supercomputer located at the Argonne Leadership
+Computing Facility. More information on Intrepid can be found at
+http://www.alcf.anl.gov/.
Requesting Access
~~~~~~~~~~~~~~~~~
@@ -125,7 +128,7 @@
TODO: Update the rest below here
-----
-include::../../tests/providers/local-cobalt/intrepid/sites.template.xml[]
+include::../../tests/providers/intrepid/sites.template.xml[]
-----
The values to note here are the ones that are listed between underscores. In the example above, they are \_QUEUE_, and \_WORK_. Queue is the PADS queue to use and WORK is the swift work directory. These are placeholder values you will need to modify to fit your needs. Copy and paste this template, replace the values, and call it sites.xml.
@@ -135,7 +138,7 @@
Below is the tc.data file used by Swift's test suite for running on PADS.
-----
-include::../../tests/providers/local-cobalt/intrepid/tc.template.data[]
+include::../../tests/providers/intrepid/tc.template.data[]
------
Copy these commands and save it as tc.data.
Copied: branches/release-0.93.1/docs/siteguide/mcs (from rev 5504, branches/release-0.93/docs/siteguide/mcs)
===================================================================
--- branches/release-0.93.1/docs/siteguide/mcs (rev 0)
+++ branches/release-0.93.1/docs/siteguide/mcs 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,55 @@
+MCS Workstations
+----------------
+This sections describes how to use the general use compute servers for
+the MCS division of Argonne National Laboratory.
+
+Create a coaster-service.conf
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+To begin, copy the text below and paste it into your Swift distribution's etc
+directory. Name the file coaster-service.conf.
+
+-----
+include::../../tests/providers/mcs/coaster-service.conf[]
+-----
+
+Starting the Coaster Service
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Change directories to the location you would like to run a
+Swift script and start the coaster service with this
+command:
+
+-----
+start-coaster-service
+-----
+
+This will create a configuration file that Swift needs
+called sites.xml.
+
+WARNING: Any existing sites.xml files in this directory
+will be overwritten. Be sure to make a copy of any
+custom configuration files you may have.
+
+Run Swift
+~~~~~~~~~
+
+Next, run Swift. If you do not have a particular script
+in mind, you can test Swift by using a Swift script in
+the examples/ directory.
+
+Run the following command to run the script:
+-----
+swift -sites.file sites.xml -tc.file tc.data yourscript.swift
+-----
+
+Stopping the Coaster Service
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The coaster service will run indefinitely. The stop-coaster-service
+script will terminate the coaster service.
+
+-----
+$ stop-coaster-service
+-----
+
+This will kill the coaster service and kill the worker scripts on remote systems.
+
Modified: branches/release-0.93.1/docs/siteguide/pads
===================================================================
--- branches/release-0.93.1/docs/siteguide/pads 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/docs/siteguide/pads 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,17 +1,41 @@
PADS
----
+PADS is a petabyte-scale, data intense computing resource located
+at the joint Argonne National Laboratory/University of Chicago
+Computation Institute. More information about PADS can be found
+at http://pads.ci.uchicago.edu.
-PADS Quickstart
-~~~~~~~~~~~~~~~
-This section will walk you through running a simple Swift script
-on PADS. It will explain how to setup software packages, how
-to create the required Swift configuration files, and finally
-how to run Swift.
+Requesting Access
+~~~~~~~~~~~~~~~~~
+If you do not already have a Computation Institute account, you can request
+access at https://www.ci.uchicago.edu/accounts. This page will give you a list
+of resources you can request access to. Be sure that PADS is selected. If
+you already have an existing CI account, but do not have access to PADS,
+send an email to support at ci.uchicago.edu to request access.
+SSH Keys
+~~~~~~~~
+Before accessing PADS, be sure to have your SSH keys configured correctly.
+There is some basic information about SSH and how to generate your key at
+http://www.ci.uchicago.edu/wiki/bin/view/Resources/SshKeys. Once you have
+followed those instructions, you can add your key at
+https://www.ci.uchicago.edu/support/sshkeys/.
+
+Connecting to a login node
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+Once your keys are configured, you should be able to access a PADS login
+node with the following command:
+
+-----
+ssh yourusername at login.pads.ci.uchicago.edu
+-----
+
Adding Software Packages
-^^^^^^^^^^^^^^^^^^^^^^^^
-In your home directory, edit a file called .soft and add these
-lines (in this order):
+~~~~~~~~~~~~~~~~~~~~~~~~
+Softenv is a system used for managing applications. In order to run Swift,
+the softenv environment will have to be modified slightly. Softenv is
+configured by a file in your home directory called .soft. Edit this file
+to look like this:
-----
+java-sun
+maui
@@ -21,6 +45,37 @@
Log out of PADS, and log back in for these changes to take effect.
+Which project(s) are you a member of?
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+PADS requires that you are a member of a project. You can determine this by
+running the following command:
+
+-----
+$ projects --available
+
+The following projects are available for your use
+
+Project PI Title
+CI-CCR000013 Michael Wilde The Swift Parallel Scripting System
+-----
+
+If you are not a member of a project, you must first request access
+to a project at http://www.ci.uchicago.edu/hpc/projects.
+
+You should make sure that you have a project set as default. Run
+the projects command with no arguments to determine if you have a default.
+
+------
+$ projects
+You have no default project set.
+-----
+
+To set your default project, use projects --set
+------
+$ projects --set CI-CCR000013 --all
+Your default project for all CI clusters has been set to CI-CCR000013.
+-----
+
Creating sites.xml
^^^^^^^^^^^^^^^^^^
Swift relies on various configuration files to determine how to
@@ -57,7 +112,6 @@
Copy a Swift Script
^^^^^^^^^^^^^^^^^^^
-
Within the Swift directory is an examples directory which contains
several introductory Swift scripts. The example we will use in this
section is called catsn.swift. Copy this script to the same directory
@@ -69,6 +123,7 @@
-----
TIP: The location of your swift directory may vary depending on how you installed it. Change this to the examples/misc directory of your installation as needed.
+
Run Swift
^^^^^^^^^
@@ -77,99 +132,21 @@
$ swift -sites.file sites.xml -tc.file tc.data catsn.swift
-----
-You should see 10 new text files get created, named catsn*.out. If
-you see these files, then you have succesfully run Swift on PADS!
+You should see several new files being created, called catsn.0001.out, catsn.0002.out, etc. Each of these
+files should contain the contents of what you placed into data.txt. If this happens, your job has run
+successfully on PADS!
TIP: Make sure your default project is defined. Read on for more information.
Read on for more detailed information about running Swift on PADS.
-Requesting Access
-~~~~~~~~~~~~~~~~~
-If you do not already have a Computation Institute account, you can request
-one at https://www.ci.uchicago.edu/accounts. This page will give you a list
-of resources you can request access to. Be sure that PADS is selected. If
-you already have an existing CI account, but do not have access to PADS,
-send an email to support at ci.uchicago.edu to request access.
-SSH Keys
-~~~~~~~~
-Before accessing PADS, be sure to have your SSH keys configured correctly.
-There is some basic information about SSH and how to generate your key at
-http://www.ci.uchicago.edu/wiki/bin/view/Resources/SshKeys. Once you have
-followed those instructions, you can add your key at
-https://www.ci.uchicago.edu/support/sshkeys/.
+Queues
+^^^^^^
-Connecting to a login node
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-Once your keys are configured, you should be able to access a PADS login
-node with the following command:
+As you run more application in the future, you will likely need
+to change queues.
------
-ssh yourusername at login.pads.ci.uchicago.edu
------
-
-Configuring softenv
-~~~~~~~~~~~~~~~~~~~
-Softenv is a system used for managing applications. In order to run Swift,
-the softenv environment will have to be modified slightly. Softenv is
-configured by a file in your home directory called .soft. Edit this file
-to look like this:
------
-+java-sun
-+maui
-+torque
- at default
------
-
-Swift Work Directory
-^^^^^^^^^^^^^^^^^^^^
-The Swift work directory is a directory which Swift uses for processing work.
-This directory needs to be writable and available to all worker nodes on
-a shared filesystem.
-
-.Examples
------
-/home/username/swiftwork
-/home/username/work
-/autonfs/gpfs-pads/projects/CI-CCR000013/myusername
------
-
-Which project(s) are you a member of?
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-PADS requires that you are a member of a project. You can determine this by
-running the following command:
-
------
-$ projects --available
-
-The following projects are available for your use
-
-Project PI Title
-
-CI-CCR000013 Michael Wilde The Swift Parallel Scripting System
------
-
-If you are not a member of a project, you must first request access
-to a project at http://www.ci.uchicago.edu/hpc/projects.
-
-You should make sure that you have a project set as default. Run
-the projects command with no arguments to determine if you have a default.
-
-------
-$ projects
-You have no default project set.
------
-
-To set your default project, use projects --set
-------
-$ projects --set CI-CCR000013 --all
-Your default project for all CI clusters has been set to CI-CCR000013.
------
-
-Determine your Queue
-^^^^^^^^^^^^^^^^^^^^
-
PADS has several different queues you can submit jobs to depending on
the type of work you will be doing. The command "qstat -q" will print
the most up to date list of this information.
@@ -185,59 +162,13 @@
|long |-- |-- |24:00:00|-- |232|130|-- | E R
|=========================================================
-Generating Configuration Files
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Now that you know what queue to use, your project, and your work directory, it is time to
-set up Swift. Swift uses a configuration file called sites.xml to determine how it should run.
-There are two methods you can use for creating this file. You can manually edit
-the configuration file, or generate it with a utility called gensites.
+When you determine your computing requirements, modify this line in your
+sites.xml:
-Manually Editing sites.xml
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-Below is the template that is used by Swift's test suite for running on PADS.
-
-----
-include::../../tests/providers/PADS/coasters/sites.template.xml[]
+<profile key="queue" namespace="globus">fast</profile>
-----
-Before you can use this configuration file, you will need to modify \_WORK_ to a directory writable by you,
-and have your default project defined. Copy this template, replace \_WORK_, and then save as sites.xml.
-
-If you wanted to use a different queue, replace "fast" with the desired queue name.
-
-Manually Editing tc.data
-~~~~~~~~~~~~~~~~~~~~~~~~
-Below is the tc.data file used by Swift's test suite for running on PADS.
-
------
-include::../../tests/providers/PADS/coasters/tc.template.data[]
-------
-
-Copy these commands and save it as tc.data.
-
-Catsn.swift
-~~~~~~~~~~~
-The swift script we will run is called catsn.swift. It simply cats a file and saves the result. This is
-a nice simple test to ensure jobs are running correctly. Create a file called data.txt which contains
-some simple input - a "hello world" will do the trick.
-
------
-include::../../examples/misc/catsn.swift[]
------
-
-
-Running Swift
-~~~~~~~~~~~~~
-Now that everything is in place, run Swift with the following command:
-
------
-swift -sites.file sites.xml -tc.file tc.data catsn.swift -n=10
------
-
-You should see several new files being created, called catsn.0001.out, catsn.0002.out, etc. Each of these
-files should contain the contents of what you placed into data.txt. If this happens, your job has run
-successfully on PADS!
-
More Help
~~~~~~~~~
The best place for additional help is the Swift user mailing list. You can subscribe to this list at
Modified: branches/release-0.93.1/docs/siteguide/siteguide.txt
===================================================================
--- branches/release-0.93.1/docs/siteguide/siteguide.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/docs/siteguide/siteguide.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -8,12 +8,17 @@
include::prereqs[]
-include::pads[]
+include::bag_of_workstations[]
+include::beagle[]
+
include::fusion[]
-include::beagle[]
-
include::futuregrid[]
include::intrepid[]
+
+include::mcs[]
+
+include::pads[]
+
Deleted: branches/release-0.93.1/docs/tutorial/.cache/tutorial.txt
===================================================================
--- branches/release-0.93/docs/tutorial/.cache/tutorial.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/docs/tutorial/.cache/tutorial.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,17 +0,0 @@
-A Swift Tutorial
-================
-
-:toc:
-:icons:
-:website: http://www.ci.uchicago.edu/swift/guides/tutorial.php
-:numbered:
-
-include::introduction[]
-
-include::hello_world[]
-
-include::language_features[]
-
-include::runtime_features[]
-
-include::bits[]
Copied: branches/release-0.93.1/docs/tutorial/.cache/tutorial.txt (from rev 5504, branches/release-0.93/docs/tutorial/.cache/tutorial.txt)
===================================================================
--- branches/release-0.93.1/docs/tutorial/.cache/tutorial.txt (rev 0)
+++ branches/release-0.93.1/docs/tutorial/.cache/tutorial.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,17 @@
+A Swift Tutorial
+================
+
+:toc:
+:icons:
+:website: http://www.ci.uchicago.edu/swift/guides/tutorial.php
+:numbered:
+
+include::introduction[]
+
+include::hello_world[]
+
+include::language_features[]
+
+include::runtime_features[]
+
+include::bits[]
Deleted: branches/release-0.93.1/docs/userguide/.cache/userguide.txt
===================================================================
--- branches/release-0.93/docs/userguide/.cache/userguide.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/docs/userguide/.cache/userguide.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,43 +0,0 @@
-Swift User Guide
-================
-
-:toc:
-:icons:
-:website: http://www.ci.uchicago.edu/swift/guides/userguide.php
-:numbered:
-
-include::overview[]
-
-include::language[]
-
-include::mappers[]
-
-include::commands[]
-
-include::app_procedures[]
-
-include::configuration_properties[]
-
-include::profiles[]
-
-include::site_catalog[]
-
-include::transformation_catalog[]
-
-include::build_options[]
-
-include::kickstart[]
-
-include::reliability_mechanisms[]
-
-include::clustering[]
-
-include::coasters[]
-
-include::howto_tips[]
-
-include::cdm[]
-
-include::log-processing[]
-
-include::troubleshooting[]
Copied: branches/release-0.93.1/docs/userguide/.cache/userguide.txt (from rev 5504, branches/release-0.93/docs/userguide/.cache/userguide.txt)
===================================================================
--- branches/release-0.93.1/docs/userguide/.cache/userguide.txt (rev 0)
+++ branches/release-0.93.1/docs/userguide/.cache/userguide.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,43 @@
+Swift User Guide
+================
+
+:toc:
+:icons:
+:website: http://www.ci.uchicago.edu/swift/guides/userguide.php
+:numbered:
+
+include::overview[]
+
+include::language[]
+
+include::mappers[]
+
+include::commands[]
+
+include::app_procedures[]
+
+include::configuration_properties[]
+
+include::profiles[]
+
+include::site_catalog[]
+
+include::transformation_catalog[]
+
+include::build_options[]
+
+include::kickstart[]
+
+include::reliability_mechanisms[]
+
+include::clustering[]
+
+include::coasters[]
+
+include::howto_tips[]
+
+include::cdm[]
+
+include::log-processing[]
+
+include::troubleshooting[]
Modified: branches/release-0.93.1/docs/userguide/cdm
===================================================================
--- branches/release-0.93.1/docs/userguide/cdm 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/docs/userguide/cdm 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,12 +1,16 @@
Collective Data Management
--------------------------
+What is CDM
+~~~~~~~~~~~
+CDM is a Swift feature that broadly enables improved management of data based on its nature and location.
+
Overview
~~~~~~~~
. The user specifies a CDM policy in a file, customarily fs.data.
. fs.data is given to Swift on the command line.
. The Swift data module (org.globus.swift.data) is informed of the CDM policy.
-. At job launch time, the VDL Karajan code queries the CDM policy,
+. At job launch time, the CDM policy is queried,
.. altering the file staging phase, and
.. sending fs.data to the compute site.
. At job run time, the Swift wrapper script
Copied: branches/release-0.93.1/docs/userguide/troubleshooting (from rev 5504, branches/release-0.93/docs/userguide/troubleshooting)
===================================================================
--- branches/release-0.93.1/docs/userguide/troubleshooting (rev 0)
+++ branches/release-0.93.1/docs/userguide/troubleshooting 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,28 @@
+Troubleshooting
+---------------
+
+In this section we will discuss some of the common issues and remedies while using Swift. The origin of these issues can be Swift or the configuration of the target site, state and us
+er configuration among other factors. We try to identify known issues and address them here:
+
+* Command not found: Swift is installed but not in path. If you see the following error message:
+
+-----
+If 'swift' is not a typo you can run the following command to lookup the
+package that contains the binary:
+ command-not-found swift
+-bash: swift: command not found
+-----
+
+The most likely cause is the Swift is not part of the environment. Do the following to load the Swift module:
+
+-----
+$ export PATH=<swift-install-location>/bin:$PATH
+-----
+
+Note: If you are running Swift on a system where it is installed as a module, do module load swift. For instance, on the Beagle supercomputer, Swift is loaded as follows:
+
+----
+$ module load swift
+Swift version swift-0.93RC5 loaded
+----
+
Modified: branches/release-0.93.1/docs/userguide/userguide.txt
===================================================================
--- branches/release-0.93.1/docs/userguide/userguide.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/docs/userguide/userguide.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -39,3 +39,5 @@
include::cdm[]
include::log-processing[]
+
+include::troubleshooting[]
Deleted: branches/release-0.93.1/docs/utils/.cache/gensites.txt
===================================================================
--- branches/release-0.93/docs/utils/.cache/gensites.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/docs/utils/.cache/gensites.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,235 +0,0 @@
-Gensites
-==========
-:toc:
-:icons:
-:website: http://www.ci.uchicago.edu/swift
-:numbered:
-
-Overview
---------
-To simplify this configuration process, versions of Swift starting with
-0.92 include a utility called gensites. The gensites command is used
-to generate a sites.xml file for running a swift workflow on a given
-site. It accomplishes this by using a series of templates. The templates
-used by gensites are the same templates used for internal testing, so
-they are likely up to date and known to work on a given site.
-
-
-Viewing All Available Site Templates
-------------------------------------
-To view a list of all available templates, run the following command:
-
------
-$ gensites -T
------
-
-You should see output similar to this:
------
-intrepid
-local
-local-pbs-coasters
-pads
-queenbee
-sge-local
-ssh
-ssh-pbs-coasters
-surveyor
------
-
-You will notice that the templates can be specific to a particular set
-of machines like Intrepid and Queenbee, or they may be more general and
-aim to work across a variety of machines, as in the case of
-local-pbs-coasters. Gensites will look in three directories for available
-templates: your current directory, $SWIFT_HOME/etc/sites and $HOME/.swift/sites.
-
-Listing the Template
---------------------
-To view the contents of a template, type:
-
------
-$ gensites -l templatename
------
-
-Running this command will print some information about the template and give
-you an idea of what settings you will need to specify. You should see
-something like this:
-
------
-Description: Template for Intrepid. More information about this system can be found at http://www.alcf.anl.gov/support/gettingstarted/index.php
-Required Tokens: host work project queue
------
-
-The required tokens are required to properly use the templates. These are placeholder
-values you will need to specify in the
-following steps.
-
-Providing Site Specific Values
-------------------------------
-
-The gensites script needs to know how to replace the placeholder values
-in the template. This is done by configuring the swift.properties file.
-Gensites will first look for a swift.properties file in the current
-directory. If it does not exist, it will next look in $HOME/.swift.
-
-To add site specific values to swift.properties, add a line in the
-follow format:
-
------
-#site templatename setting=value
------
-
-Continuing the previous example, here is what you could add to
-swift.properties to replace the values of project, queue and work for
-the surveyor template:
-
------
-#site surveyor project=MyProject
-#site surveyor queue=MyQueue
-#site surveyor work=/path/to/workdir
------
-
-Now, running the command 'gensites surveyor' will produce the following
-valid configuration file:
-
------
-<config>
- <pool handle="surveyor">
- <filesystem provider="local" />
- <execution provider="coaster" jobmanager="local:cobalt"/>
- <profile namespace="globus" key="project">MyProject</profile>
- <profile namespace="globus" key="queue">MyQueue</profile>
- <profile namespace="globus" key="kernelprofile">zeptoos</profile>
- <profile namespace="globus" key="alcfbgpnat">true</profile>
- <profile namespace="karajan" key="jobthrottle">21</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <profile namespace="globus" key="workersPerNode">1</profile>
- <profile namespace="globus" key="workerLoggingLevel">DEBUG</profile>
- <profile namespace="globus" key="slots">1</profile>
- <profile namespace="globus" key="maxTime">900</profile>
- <profile namespace="globus" key="nodeGranularity">64</profile>
- <profile namespace="globus" key="maxNodes">64</profile>
- <workdirectory>/path/to/workdir</workdirectory>
- </pool>
-</config>
------
-
-Generating Application Configurations with Gensites
----------------------------------------------------
-Gensites can also be used to create a valid application catalog, commonly
-called tc.data. Here are some examples of how to specify applications within
-your swift.properties file:
-
------
-#app intrepid echo=/usr/bin/echo
------
-
-This first example shows a site specific application. The #app definition
-tells gensites this is related to an application rather than a #site
-definition. In the second part, echo=/usr/bin/echo, the left hand side
-is the name of the application that will be called from within swift. The
-right hand site is the path name which points to the binary.
-
------
-#app intrepid echo=$HOME/bin/echo
------
-
-Environment variables will be interpreted and converted to full path names
-for Swift.
-
------
-#app intrepid echo=bin/echo
------
-
-Gensites can take relative paths (relative to your current directory) and
-translate them to full path names for Swift.
-
-WARNING: Running gensites with #app definitions will replace any file
-called tc.data in your current directory. If a file called tc.data exists,
-it will be renamed to tc.data.old. If you run gensites twice, the original
-contents of your tc.data will be lost. Please either rename your tc file
-or copy to a different location.
-
-Running Swift With the New Configuration
-----------------------------------------
-
-Now that the gensites is configured and producing a valid configuration
-file, Swift needs to know to use it. The first step is to create a
-unique config file based on the preferences you specified.
-
------
-$ gensites surveyor > myconfig.xml
------
-
-This will send the output of gensites to myconfig.xml. This example will
-use a swift.properties location in the default directories (your current
-directory, ~/.swift/swift.properties). To specify a different location
-to the swift.properties, use:
-
------
-$ gensites surveyor -p myswift.properties > myconfig.xml
------
-
-Next, provide the configuration filename to swift:
------
-$ swift -sites.file myconfig.xml myscript.swift
------
-
-Alternatively, if you have specified applications, be sure to load that into
-Swift
------
-$ swift -sites.file myconfig.xml -tc.file tc.data mycript.swift
------
-
-Providing Default Values for All Templates
-------------------------------------------
-It is also possible to specify a default value for a setting, regardless
-of template you use. If you want to set your queue to default to "fast"
-across all templates, you can do this by omitting the template name.
-Consider the following swift.properties:
-
------
-#site queue=fast
-#site surveyor project=MyProject
-#site surveyor work=/path/to/workdir
------
-By omitting the template name, the default value for queue on surveyor
-(and any other template you use) will be set to "fast". One thing to
-keep in mind when setting default values is that order matters. Be sure
-to set your default values first before setting template specific values.
-
-Just like the #site definitions, when a site name is not specified, an app
-will be created for every site that is defined in your template.
------
-#app echo=/bin/echo
------
-
-More Help
----------
-The gensites script provides additional options not discussed here, such
-as using templates and swift.properties in non-standard directories. For
-more information, run gensites -h. Here is a full list of all options
-available.
-
------
-$ gensites -help
-
- usage: gensites template [-p properties.file] [-L template_directory] [-h] [-T] [-l]
-
- template Name of template to use
- -p properties.file Specify a swift.properties to use
- -L template_directory Specify a non-standard template directory
- -T List all templates available
- -h Help / usage information
- -l List the contents of a specific template
-
- Examples:
-
- Create a site configuration file for sites.xml using default properties.file in current directory
- $ gensites pads > sites.xml
-
- Use a specific properties file for a site
- $ gensites -p sites.properties pads > sites.xml
-
- Specify a non-standard directory where templates are located
- $ gensites -L template.dir pads > sites.xml
------
Copied: branches/release-0.93.1/docs/utils/.cache/gensites.txt (from rev 5504, branches/release-0.93/docs/utils/.cache/gensites.txt)
===================================================================
--- branches/release-0.93.1/docs/utils/.cache/gensites.txt (rev 0)
+++ branches/release-0.93.1/docs/utils/.cache/gensites.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,235 @@
+Gensites
+==========
+:toc:
+:icons:
+:website: http://www.ci.uchicago.edu/swift
+:numbered:
+
+Overview
+--------
+To simplify this configuration process, versions of Swift starting with
+0.92 include a utility called gensites. The gensites command is used
+to generate a sites.xml file for running a swift workflow on a given
+site. It accomplishes this by using a series of templates. The templates
+used by gensites are the same templates used for internal testing, so
+they are likely up to date and known to work on a given site.
+
+
+Viewing All Available Site Templates
+------------------------------------
+To view a list of all available templates, run the following command:
+
+-----
+$ gensites -T
+-----
+
+You should see output similar to this:
+-----
+intrepid
+local
+local-pbs-coasters
+pads
+queenbee
+sge-local
+ssh
+ssh-pbs-coasters
+surveyor
+-----
+
+You will notice that the templates can be specific to a particular set
+of machines like Intrepid and Queenbee, or they may be more general and
+aim to work across a variety of machines, as in the case of
+local-pbs-coasters. Gensites will look in three directories for available
+templates: your current directory, $SWIFT_HOME/etc/sites and $HOME/.swift/sites.
+
+Listing the Template
+--------------------
+To view the contents of a template, type:
+
+-----
+$ gensites -l templatename
+-----
+
+Running this command will print some information about the template and give
+you an idea of what settings you will need to specify. You should see
+something like this:
+
+-----
+Description: Template for Intrepid. More information about this system can be found at http://www.alcf.anl.gov/support/gettingstarted/index.php
+Required Tokens: host work project queue
+-----
+
+The required tokens are required to properly use the templates. These are placeholder
+values you will need to specify in the
+following steps.
+
+Providing Site Specific Values
+------------------------------
+
+The gensites script needs to know how to replace the placeholder values
+in the template. This is done by configuring the swift.properties file.
+Gensites will first look for a swift.properties file in the current
+directory. If it does not exist, it will next look in $HOME/.swift.
+
+To add site specific values to swift.properties, add a line in the
+follow format:
+
+-----
+#site templatename setting=value
+-----
+
+Continuing the previous example, here is what you could add to
+swift.properties to replace the values of project, queue and work for
+the surveyor template:
+
+-----
+#site surveyor project=MyProject
+#site surveyor queue=MyQueue
+#site surveyor work=/path/to/workdir
+-----
+
+Now, running the command 'gensites surveyor' will produce the following
+valid configuration file:
+
+-----
+<config>
+ <pool handle="surveyor">
+ <filesystem provider="local" />
+ <execution provider="coaster" jobmanager="local:cobalt"/>
+ <profile namespace="globus" key="project">MyProject</profile>
+ <profile namespace="globus" key="queue">MyQueue</profile>
+ <profile namespace="globus" key="kernelprofile">zeptoos</profile>
+ <profile namespace="globus" key="alcfbgpnat">true</profile>
+ <profile namespace="karajan" key="jobthrottle">21</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <profile namespace="globus" key="workersPerNode">1</profile>
+ <profile namespace="globus" key="workerLoggingLevel">DEBUG</profile>
+ <profile namespace="globus" key="slots">1</profile>
+ <profile namespace="globus" key="maxTime">900</profile>
+ <profile namespace="globus" key="nodeGranularity">64</profile>
+ <profile namespace="globus" key="maxNodes">64</profile>
+ <workdirectory>/path/to/workdir</workdirectory>
+ </pool>
+</config>
+-----
+
+Generating Application Configurations with Gensites
+---------------------------------------------------
+Gensites can also be used to create a valid application catalog, commonly
+called tc.data. Here are some examples of how to specify applications within
+your swift.properties file:
+
+-----
+#app intrepid echo=/usr/bin/echo
+-----
+
+This first example shows a site specific application. The #app definition
+tells gensites this is related to an application rather than a #site
+definition. In the second part, echo=/usr/bin/echo, the left hand side
+is the name of the application that will be called from within swift. The
+right hand site is the path name which points to the binary.
+
+-----
+#app intrepid echo=$HOME/bin/echo
+-----
+
+Environment variables will be interpreted and converted to full path names
+for Swift.
+
+-----
+#app intrepid echo=bin/echo
+-----
+
+Gensites can take relative paths (relative to your current directory) and
+translate them to full path names for Swift.
+
+WARNING: Running gensites with #app definitions will replace any file
+called tc.data in your current directory. If a file called tc.data exists,
+it will be renamed to tc.data.old. If you run gensites twice, the original
+contents of your tc.data will be lost. Please either rename your tc file
+or copy to a different location.
+
+Running Swift With the New Configuration
+----------------------------------------
+
+Now that the gensites is configured and producing a valid configuration
+file, Swift needs to know to use it. The first step is to create a
+unique config file based on the preferences you specified.
+
+-----
+$ gensites surveyor > myconfig.xml
+-----
+
+This will send the output of gensites to myconfig.xml. This example will
+use a swift.properties location in the default directories (your current
+directory, ~/.swift/swift.properties). To specify a different location
+to the swift.properties, use:
+
+-----
+$ gensites surveyor -p myswift.properties > myconfig.xml
+-----
+
+Next, provide the configuration filename to swift:
+-----
+$ swift -sites.file myconfig.xml myscript.swift
+-----
+
+Alternatively, if you have specified applications, be sure to load that into
+Swift
+-----
+$ swift -sites.file myconfig.xml -tc.file tc.data mycript.swift
+-----
+
+Providing Default Values for All Templates
+------------------------------------------
+It is also possible to specify a default value for a setting, regardless
+of template you use. If you want to set your queue to default to "fast"
+across all templates, you can do this by omitting the template name.
+Consider the following swift.properties:
+
+-----
+#site queue=fast
+#site surveyor project=MyProject
+#site surveyor work=/path/to/workdir
+-----
+By omitting the template name, the default value for queue on surveyor
+(and any other template you use) will be set to "fast". One thing to
+keep in mind when setting default values is that order matters. Be sure
+to set your default values first before setting template specific values.
+
+Just like the #site definitions, when a site name is not specified, an app
+will be created for every site that is defined in your template.
+-----
+#app echo=/bin/echo
+-----
+
+More Help
+---------
+The gensites script provides additional options not discussed here, such
+as using templates and swift.properties in non-standard directories. For
+more information, run gensites -h. Here is a full list of all options
+available.
+
+-----
+$ gensites -help
+
+ usage: gensites template [-p properties.file] [-L template_directory] [-h] [-T] [-l]
+
+ template Name of template to use
+ -p properties.file Specify a swift.properties to use
+ -L template_directory Specify a non-standard template directory
+ -T List all templates available
+ -h Help / usage information
+ -l List the contents of a specific template
+
+ Examples:
+
+ Create a site configuration file for sites.xml using default properties.file in current directory
+ $ gensites pads > sites.xml
+
+ Use a specific properties file for a site
+ $ gensites -p sites.properties pads > sites.xml
+
+ Specify a non-standard directory where templates are located
+ $ gensites -L template.dir pads > sites.xml
+-----
Modified: branches/release-0.93.1/etc/coaster-service.conf
===================================================================
--- branches/release-0.93.1/etc/coaster-service.conf 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/etc/coaster-service.conf 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,11 +1,8 @@
-# Keep all interesting settings in one place
-# User should modify this to fit environment
-
# Location of SWIFT. If empty, PATH is searched
export SWIFT=
# Where to copy worker.pl on the remote machine for sites.xml
-export WORKER_WORK=$HOME/swiftwork
+export WORKER_LOCATION=$HOME/swiftwork
# How to launch workers: local, ssh, cobalt, or futuregrid
export WORKER_MODE=ssh
@@ -29,7 +26,10 @@
export LOCAL_PORT=
export SERVICE_PORT=
-# start-coaster-service tries to automatically detect the IP address of this system. Specify here if you have multiple network interfaces
+# This is the IP address to which the workers will connect
+# If not given, start-coaster-service tries to automatically detect
+# the IP address of this system via ifconfig
+# Specify this if you have multiple network interfaces
export IPADDR=
# Location of the swift-vm-boot scripts
@@ -37,6 +37,10 @@
# Swift information for creating sites.xml
export WORK=$HOME/swiftwork
-export QUEUE=prod-devel
-export MAXTIME=20
-export NODE=64
+
+# Jobs per node is usually equal to the number of CPUs per node
+export JOBS_PER_NODE=2
+
+# To calculate job throttle:
+# jobs per node * nodes - 0.1 / 100
+export JOB_THROTTLE=0.059
Modified: branches/release-0.93.1/etc/sites/intrepid
===================================================================
--- branches/release-0.93.1/etc/sites/intrepid 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/etc/sites/intrepid 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,3 +1,5 @@
+<!-- Template for Intrepid. More information about this system can be found -->
+<!-- at http://www.alcf.anl.gov/support/gettingstarted/index.php -->
<config>
<pool handle="localhost" sysinfo="INTEL32::LINUX">
@@ -4,7 +6,6 @@
<gridftp url="local://localhost" />
<execution provider="local" url="none" />
<workdirectory>_WORK_</workdirectory>
- <!-- <profile namespace="karajan" key="maxSubmitRate">1</profile> -->
<profile namespace="karajan" key="jobThrottle">0.04</profile>
<profile namespace="swift" key="stagingMethod">file</profile>
</pool>
@@ -12,7 +13,6 @@
<pool handle="coasters_alcfbgp">
<filesystem provider="local" />
<execution provider="coaster" jobmanager="local:cobalt"/>
- <!-- <profile namespace="swift" key="stagingMethod">local</profile> -->
<profile namespace="globus" key="internalHostname">_HOST_</profile>
<profile namespace="globus" key="project">_PROJECT_</profile>
<profile namespace="globus" key="queue">_QUEUE_</profile>
@@ -23,7 +23,7 @@
<profile namespace="globus" key="jobsPerNode">1</profile>
<profile namespace="globus" key="workerLoggingLevel">DEBUG</profile>
<profile namespace="globus" key="slots">1</profile>
- <profile namespace="globus" key="maxTime">900</profile> <!-- seconds -->
+ <profile namespace="globus" key="maxTime">900</profile>
<profile namespace="globus" key="nodeGranularity">64</profile>
<profile namespace="globus" key="maxNodes">64</profile>
<workdirectory>_WORK_</workdirectory>
Copied: branches/release-0.93.1/etc/sites/mcs (from rev 5504, branches/release-0.93/etc/sites/mcs)
===================================================================
--- branches/release-0.93.1/etc/sites/mcs (rev 0)
+++ branches/release-0.93.1/etc/sites/mcs 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,13 @@
+<config>
+ <pool handle="persistent-coasters">
+ <execution provider="coaster-persistent"
+ url="_EXECUTION_URL_"
+ jobmanager="local:local"/>
+ <profile namespace="globus" key="workerManager">passive</profile>
+ <profile namespace="globus" key="jobsPerNode">_JOBS_PER_NODE</profile>
+ <profile key="jobThrottle" namespace="karajan">_JOB_THROTTLE_</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <filesystem provider="local" url="none" />
+ <workdirectory>_WORK_</workdirectory>
+ </pool>
+</config>
Modified: branches/release-0.93.1/etc/sites/persistent-coasters
===================================================================
--- branches/release-0.93.1/etc/sites/persistent-coasters 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/etc/sites/persistent-coasters 2012-01-22 03:23:13 UTC (rev 5505)
@@ -4,8 +4,8 @@
url="_EXECUTION_URL_"
jobmanager="local:local"/>
<profile namespace="globus" key="workerManager">passive</profile>
- <profile namespace="globus" key="workersPerNode">4</profile>
- <profile key="jobThrottle" namespace="karajan">.03</profile>
+ <profile namespace="globus" key="jobsPerNode">_JOBS_PER_NODE_</profile>
+ <profile key="jobThrottle" namespace="karajan">_JOB_THROTTLE_</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
<filesystem provider="local" url="none" />
<workdirectory>_WORK_</workdirectory>
Copied: branches/release-0.93.1/examples/misc/data.txt (from rev 5504, branches/release-0.93/examples/misc/data.txt)
===================================================================
--- branches/release-0.93.1/examples/misc/data.txt (rev 0)
+++ branches/release-0.93.1/examples/misc/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+hello
Modified: branches/release-0.93.1/libexec/_swiftwrap.staging
===================================================================
--- branches/release-0.93.1/libexec/_swiftwrap.staging 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/libexec/_swiftwrap.staging 2012-01-22 03:23:13 UTC (rev 5505)
@@ -302,15 +302,6 @@
fi
checkError $? "Application $EXEC failed with an exit code of $?" <$STDERR
-if [ ! -s "$STDOUT" ]; then
- log "Removing empty stdout"
- rm -f $STDOUT
-fi
-if [ ! -s "$STDERR" ]; then
- log "Removing empty stderr"
- rm -f $STDERR
-fi
-
logstate "EXECUTE_DONE"
log "Job ran successfully"
Property changes on: branches/release-0.93.1/libexec/log-processing/active-state-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/add-runid-as-prefix
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/affine-transform
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/aggregate.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/all-kickstarts-to-event
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/all-logs-active-jobsubmissions-count-graph
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/annotate-karatasks-with-execute2-id
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/assorted.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/autospace-data
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/b.plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/bars
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/cli-finished
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/cli-version
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/cluster-report
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/cluster-stats
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/colour-execute2
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/colour-execute2-by-falkon
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/colour-karatasks
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/colour.plot.template
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/coloured-event-plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/combine-execute-start-last-times
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/combine-start-last-times
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/combine-start-last-times-to-event
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/compute-t-inf
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/create-everylog-vs-versions-data
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/duration-histogram.plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/duration-of-workflow
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/error-summary
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/event-duration-stats
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/events-in-progress
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/events-in-progress-first-loop.pl
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/events-in-progress-second-loop.pl
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/events-in-progress-third-loop.pl
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/everylog-active-submissions.plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/everylog-durations-of-workflows
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/everylog-summary.html
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/everylog-time-cumulative.plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/everylog-to-event
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/everylog-version-cumulative.plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/everylog-vs-versions
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/everylog-vs-versions.plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/everylog.html
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/execstages-plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/execstages.plot.template
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/execute.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/execute.progress
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/execute2-by-falkon.channels
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/execute2-status-from-log
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/execute2-summary-from-log
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/execute2.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/execution-summaries
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/extract-activity-for-subthreads-of
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/extract-activity-for-task
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/extract-activity-for-thread
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/extract-completed-time-for-run-id
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/extract-end-time
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/extract-execute-start-times
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/extract-failed-time-for-run-id
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/extract-jobid-karajanid-bindings
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/extract-last-time-for-execute
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/extract-start-time
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/extract-start-times
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/falkon-to-event
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/falkon.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/generate-karatasks-event
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/get-jobid-for-karajanid
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/get-replicationid-for-execute2id
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/get-site-for-run-id
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/get-thread-for-run-id
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/index.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/info-and-karajan-actives
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/info-and-karajan-actives.2.plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/info-and-karajan-actives.plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/info-to-md5
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/info-to-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/info-to-zeroed-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/info.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/iso-to-secs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/karajan.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/karatasks-coloured.channels
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/karatasks-coloured.channels.nm
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/karatasks-only
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/kickstart.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/kickstarts-to-event
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/kickstarts-to-plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/last-times
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/last-transition-line
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/list-known-tasks
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/list-known-threads
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/log-to-createdirset-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/log-to-dostagein-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/log-to-dostageout-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/log-to-execute-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/log-to-execute2-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/log-to-initshareddir-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/log-to-karatasks-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/logs-for-all
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/lookup-colour
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/makefile
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/makefile.cluster
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/makefile.errors
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/makefile.falkon
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/makefile.implicit
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/makefile.karatasks
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/makefile.kickstart
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/makefile.webpage
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/max-duration
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/normalise-event-start-time
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/normalise-event-start-time-to-any
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/number-events
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/number-sites-list
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/overview-reports.sh
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/overview.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/p1.plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/per-site-execute2-durations
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/plot-duration-histogram
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/plot-everylogs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/plot1
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/q.plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/queue-state-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/retrycounts
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/scheduler.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/sec-to-utc
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/sec-to-utc-day
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/separate-execute-last-summary
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/simple-event-plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/slt2.plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/sort-preserve
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/sp.plot.template
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/split-start-times-shifted
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/start-last-times-and-kickstart
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/start-last-times-and-kickstart.plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/start-last-times.plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/start-times.plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/sum-tt1.pl
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/swap-and-sort
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/swap-and-sort-and-swap
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/swift-standard-log-to-transition
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/table-jobs-sites
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/task-status-to-transitions
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/tasks-in-cluster
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/tie-url-filenames
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/times-for-all-tasks
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/toolbar.html.template
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/total-event-plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/total.plot.template
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/trail
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/trail-freex
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/trail-freex.plot.template
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/trail.plot.template
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/transitions-to-cedps
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/transitions-to-event
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/tscore.sh
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/tscores.plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/weights.plot
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/weights.sh
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/whole-workflow-event
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/libexec/log-processing/whole-workflow-time
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/release-0.93.1/resources/swiftscript.stg
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: branches/release-0.93.1/src/org/griphyn/vdl/engine/Karajan.java
===================================================================
--- branches/release-0.93.1/src/org/griphyn/vdl/engine/Karajan.java 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/src/org/griphyn/vdl/engine/Karajan.java 2012-01-22 03:23:13 UTC (rev 5505)
@@ -157,28 +157,23 @@
logger.debug("Importing module "+moduleToImport);
if(!importedNames.contains(moduleToImport)) {
- // TODO PATH/PERL5LIB-style path handling
- //String swiftfilename = "./"+moduleToImport+".swift";
- //String xmlfilename = "./"+moduleToImport+".xml";
String lib_path = System.getenv("SWIFT_LIB");
- String swiftfilename = moduleToImport+".swift";
- String xmlfilename = moduleToImport+".xml";
+ String swiftfilename = "./"+moduleToImport+".swift";
+ String xmlfilename = "./"+moduleToImport+".xml";
File local = new File(swiftfilename);
if( !( lib_path == null || local.exists() ) )
{
- StringTokenizer st = new StringTokenizer(lib_path, ":");
- while(st.hasMoreTokens())
+ String[] path = lib_path.split(":");
+ for(String entry : path)
{
- String path = st.nextToken();
- String lib_script_location = path + "/" + swiftfilename;
- File tmp = new File(lib_script_location);
+ String lib_script_location = entry + "/" + swiftfilename;
+ File file = new File(lib_script_location);
- if(tmp.exists())
+ if(file.exists())
{
- swiftfilename = path + "/" + swiftfilename;
- xmlfilename = path + "/" + xmlfilename;
- moduleToImport = path + "/" + moduleToImport;
+ swiftfilename = entry + "/" + swiftfilename;
+ moduleToImport = entry + "/" + moduleToImport;
break;
}
}
Modified: branches/release-0.93.1/src/org/griphyn/vdl/karajan/ArrayIndexFutureList.java
===================================================================
--- branches/release-0.93.1/src/org/griphyn/vdl/karajan/ArrayIndexFutureList.java 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/src/org/griphyn/vdl/karajan/ArrayIndexFutureList.java 2012-01-22 03:23:13 UTC (rev 5505)
@@ -21,11 +21,12 @@
import org.globus.cog.karajan.workflow.futures.ListenerStackPair;
import org.griphyn.vdl.mapping.ArrayDataNode;
-public class ArrayIndexFutureList implements FutureList, FutureWrapper {
+public class ArrayIndexFutureList implements FutureList, FutureWrapper {
private ArrayList<Object> keys;
private Map<?, ?> values;
private List<ListenerStackPair> listeners;
private ArrayDataNode node;
+ private boolean purged;
public ArrayIndexFutureList(ArrayDataNode node, Map<?, ?> values) {
this.node = node;
@@ -50,11 +51,15 @@
}
public int available() {
- return keys.size();
+ synchronized(node) {
+ return keys.size();
+ }
}
public void addKey(Object key) {
- keys.add(key);
+ synchronized(node) {
+ keys.add(key);
+ }
notifyListeners();
}
@@ -67,10 +72,7 @@
}
public void close() {
- synchronized(node) {
- purge();
- }
- notifyListeners();
+ throw new UnsupportedOperationException("Not used here");
}
private void purge() {
@@ -78,11 +80,18 @@
allkeys.removeAll(keys);
// remaining keys must be added
keys.addAll(allkeys);
+ purged = true;
}
public boolean isClosed() {
synchronized(node) {
- return node.isClosed();
+ boolean closed = node.isClosed();
+ if (closed && !purged) {
+ // this is done here because no explicit close() is
+ // ever called on this object
+ purge();
+ }
+ return closed;
}
}
Modified: branches/release-0.93.1/src/org/griphyn/vdl/karajan/FutureTracker.java
===================================================================
--- branches/release-0.93.1/src/org/griphyn/vdl/karajan/FutureTracker.java 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/src/org/griphyn/vdl/karajan/FutureTracker.java 2012-01-22 03:23:13 UTC (rev 5505)
@@ -46,4 +46,8 @@
public Map<DSHandle, Future> getMap() {
return futures;
}
+
+ public synchronized Map<DSHandle, Future> getMapSafe() {
+ return new HashMap<DSHandle, Future>(futures);
+ }
}
Modified: branches/release-0.93.1/src/org/griphyn/vdl/karajan/Monitor.java
===================================================================
--- branches/release-0.93.1/src/org/griphyn/vdl/karajan/Monitor.java 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/src/org/griphyn/vdl/karajan/Monitor.java 2012-01-22 03:23:13 UTC (rev 5505)
@@ -200,7 +200,7 @@
public static void dumpVariables(PrintStream ps) {
ps.println("\nRegistered futures:");
- Map<DSHandle, Future> map = FutureTracker.get().getMap();
+ Map<DSHandle, Future> map = FutureTracker.get().getMapSafe();
synchronized (map) {
for (Map.Entry<DSHandle, Future> en : map.entrySet()) {
Future f = en.getValue();
Modified: branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/CreateArray.java
===================================================================
--- branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/CreateArray.java 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/CreateArray.java 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,16 +1,19 @@
package org.griphyn.vdl.karajan.lib;
-import java.util.Iterator;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.apache.log4j.Logger;
-
import org.globus.cog.karajan.arguments.Arg;
import org.globus.cog.karajan.stack.VariableStack;
import org.globus.cog.karajan.workflow.ExecutionException;
+import org.globus.cog.karajan.workflow.futures.FutureFault;
import org.griphyn.vdl.mapping.DSHandle;
import org.griphyn.vdl.mapping.Path;
import org.griphyn.vdl.mapping.RootArrayDataNode;
+import org.griphyn.vdl.type.Field;
import org.griphyn.vdl.type.Type;
public class CreateArray extends VDLFunction {
@@ -23,7 +26,8 @@
setArguments(CreateArray.class, new Arg[] { PA_VALUE });
}
- public Object function(VariableStack stack) throws ExecutionException {
+ @SuppressWarnings("unchecked")
+ public Object function(VariableStack stack) throws ExecutionException {
Object value = PA_VALUE.getValue(stack);
try {
@@ -32,56 +36,105 @@
"An array variable can only be initialized with a list of values");
}
- Type type = null;
+ Type type = checkTypes((List<?>) value);
+
+ DSHandle handle = new RootArrayDataNode(type.arrayType());
+ if (hasMappableFields(type)) {
+ setMapper(handle);
+ }
- Iterator i = ((List) value).iterator();
- while (i.hasNext()) {
- Object o = i.next();
- if (o instanceof DSHandle) {
- DSHandle d = (DSHandle)o;
- Type thisType = d.getType();
- if(type == null) {
- // this first element
- type = thisType;
- } else {
- // other elements, when we have a type to expect
- if(!(type.equals(thisType))) {
- throw new RuntimeException(
- "Expecting all array elements to have SwiftScript type "+type+" but found an element with type "+thisType);
- }
- }
- }
- else {
- throw new RuntimeException("An array variable can only be initialized by a list of DSHandle values.");
- }
-
+ if (logger.isInfoEnabled()) {
+ logger.info("CREATEARRAY START array=" + handle.getIdentifier());
}
- DSHandle handle = new RootArrayDataNode(type.arrayType());
-
- logger.info("CREATEARRAY START array="+handle.getIdentifier());
-
int index = 0;
- i = ((List) value).iterator();
- while (i.hasNext()) {
+ for (Object o : (List<?>) value) {
// TODO check type consistency of elements with
// the type of the array
- DSHandle n = (DSHandle) i.next();
+ DSHandle n = (DSHandle) o;
// we know this DSHandle cast will work because we checked
// it in the previous scan of the array contents
Path p = Path.EMPTY_PATH.addLast(String.valueOf(index), true);
+
+ DSHandle dst = handle.getField(p);
- handle.getField(p).set(n);
- logger.info("CREATEARRAY MEMBER array="+handle.getIdentifier()+" index="+index+" member="+n.getIdentifier());
+ SetFieldValue.deepCopy(dst, n, stack, 1);
+
+ if (logger.isInfoEnabled()) {
+ logger.info("CREATEARRAY MEMBER array=" + handle.getIdentifier()
+ + " index=" + index + " member=" + n.getIdentifier());
+ }
index++;
}
+
handle.closeShallow();
- logger.info("CREATEARRAY COMPLETED array="+handle.getIdentifier());
+
+ if (logger.isInfoEnabled()) {
+ logger.info("CREATEARRAY COMPLETED array=" + handle.getIdentifier());
+ }
return handle;
}
+ catch (FutureFault e) {
+ throw e;
+ }
catch (Exception e) {
throw new ExecutionException(e);
}
}
+
+ private void setMapper(DSHandle handle) {
+ // slap a concurrent mapper on this
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put("descriptor", "concurrent_mapper");
+ params.put("dbgname", "arrayexpr");
+ handle.init(params);
+ }
+
+ private boolean hasMappableFields(Type type) {
+ if (type.isPrimitive()) {
+ return false;
+ }
+ else if (!type.isComposite()) {
+ return true;
+ }
+ else if (type.isArray()) {
+ return hasMappableFields(type.itemType());
+ }
+ else {
+ // struct
+ for (Field f : type.getFields()) {
+ if (hasMappableFields(f.getType())) {
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+
+ private Type checkTypes(List<?> value) {
+ Type type = null;
+
+ for (Object o : value) {
+ if (o instanceof DSHandle) {
+ DSHandle d = (DSHandle)o;
+ Type thisType = d.getType();
+ if(type == null) {
+ // this first element
+ type = thisType;
+ } else {
+ // other elements, when we have a type to expect
+ if(!(type.equals(thisType))) {
+ throw new RuntimeException(
+ "Expecting all array elements to have SwiftScript type " +
+ type + " but found an element with type "+thisType);
+ }
+ }
+ }
+ else {
+ throw new RuntimeException("An array variable can only be initialized by a list of DSHandle values.");
+ }
+ }
+ return type;
+ }
}
Modified: branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java
===================================================================
--- branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/SetFieldValue.java 2012-01-22 03:23:13 UTC (rev 5505)
@@ -17,7 +17,10 @@
import org.griphyn.vdl.mapping.AbstractDataNode;
import org.griphyn.vdl.mapping.DSHandle;
import org.griphyn.vdl.mapping.InvalidPathException;
+import org.griphyn.vdl.mapping.Mapper;
import org.griphyn.vdl.mapping.Path;
+import org.griphyn.vdl.type.Field;
+import org.griphyn.vdl.type.Type;
public class SetFieldValue extends VDLFunction {
public static final Logger logger = Logger.getLogger(SetFieldValue.class);
@@ -81,15 +84,17 @@
String unpackHandles(Map<String,DSHandle> handles) {
StringBuilder sb = new StringBuilder();
sb.append("{");
- Iterator<Map.Entry<String,DSHandle>> it =
- handles.entrySet().iterator();
- while (it.hasNext()) {
- Map.Entry<String,DSHandle> entry = it.next();
- sb.append(entry.getKey());
- sb.append('=');
- sb.append(entry.getValue().getValue());
- if (it.hasNext())
- sb.append(", ");
+ synchronized(handles) {
+ Iterator<Map.Entry<String,DSHandle>> it =
+ handles.entrySet().iterator();
+ while (it.hasNext()) {
+ Map.Entry<String,DSHandle> entry = it.next();
+ sb.append(entry.getKey());
+ sb.append('=');
+ sb.append(entry.getValue().getValue());
+ if (it.hasNext())
+ sb.append(", ");
+ }
}
sb.append("}");
return sb.toString();
@@ -97,83 +102,114 @@
/** make dest look like source - if its a simple value, copy that
and if its an array then recursively copy */
- void deepCopy(DSHandle dest, DSHandle source, VariableStack stack, int level) throws ExecutionException {
+ public static void deepCopy(DSHandle dest, DSHandle source, VariableStack stack, int level) throws ExecutionException {
((AbstractDataNode) source).waitFor();
if (source.getType().isPrimitive()) {
dest.setValue(source.getValue());
}
else if (source.getType().isArray()) {
- PairIterator it;
- if (stack.isDefined("it" + level)) {
- it = (PairIterator) stack.getVar("it" + level);
- }
- else {
- it = new PairIterator(source.getArrayValue());
- stack.setVar("it" + level, it);
- }
- while (it.hasNext()) {
- Pair pair = (Pair) it.next();
- Object lhs = pair.get(0);
- DSHandle rhs = (DSHandle) pair.get(1);
- Path memberPath;
- if (lhs instanceof Double) {
- memberPath = Path.EMPTY_PATH.addLast(String.valueOf(((Double) lhs).intValue()), true);
- }
- else {
- memberPath = Path.EMPTY_PATH.addLast(String.valueOf(lhs), true);
- }
- DSHandle field;
- try {
- field = dest.getField(memberPath);
- }
- catch (InvalidPathException ipe) {
- throw new ExecutionException("Could not get destination field",ipe);
- }
- deepCopy(field, rhs, stack, level + 1);
- }
- stack.currentFrame().deleteVar("it" + level);
- dest.closeShallow();
- }
- else if (!source.getType().isComposite()) {
- Path dpath = dest.getPathFromRoot();
- if (dest.getMapper().canBeRemapped(dpath)) {
- if (logger.isDebugEnabled()) {
- logger.debug("Remapping " + dest + " to " + source);
- }
- dest.getMapper().remap(dpath, source.getMapper().map(source.getPathFromRoot()));
- dest.closeShallow();
- }
- else {
- if (stack.currentFrame().isDefined("fc")) {
- FileCopier fc = (FileCopier) stack.currentFrame().getVar("fc");
- if (!fc.isClosed()) {
- throw new FutureNotYetAvailable(fc);
- }
- else {
- if (fc.getException() != null) {
- throw new ExecutionException("Failed to copy " + source + " to " + dest, fc.getException());
- }
- }
- dest.closeShallow();
- }
- else {
- FileCopier fc = new FileCopier(source.getMapper().map(source.getPathFromRoot()),
- dest.getMapper().map(dpath));
- stack.setVar("fc", fc);
- try {
- fc.start();
- }
- catch (Exception e) {
- throw new ExecutionException("Failed to start file copy", e);
- }
- throw new FutureNotYetAvailable(fc);
- }
- }
+ copyArray(dest, source, stack, level);
}
+ else if (source.getType().isComposite()) {
+ copyStructure(dest, source, stack, level);
+ }
else {
- // TODO implement this
- //throw new RuntimeException("Deep non-array structure copying not implemented, when trying to copy "+source);
+ copyNonComposite(dest, source, stack, level);
}
}
+ private static void copyStructure(DSHandle dest, DSHandle source,
+ VariableStack stack, int level) throws ExecutionException {
+ Type type = dest.getType();
+ for (String fname : type.getFieldNames()) {
+ Path fpath = Path.EMPTY_PATH.addFirst(fname);
+ try {
+ DSHandle dstf = dest.getField(fpath);
+ try {
+ DSHandle srcf = source.getField(fpath);
+ deepCopy(dstf, srcf, stack, level + 1);
+ }
+ catch (InvalidPathException e) {
+ // do nothing. It's an unused field in the source.
+ }
+ }
+ catch (InvalidPathException e) {
+ throw new ExecutionException("Internal type inconsistency detected. " +
+ dest + " claims not to have a " + fname + " field");
+ }
+ }
+ }
+
+ private static void copyNonComposite(DSHandle dest, DSHandle source,
+ VariableStack stack, int level) throws ExecutionException {
+ Path dpath = dest.getPathFromRoot();
+ Mapper dmapper = dest.getRoot().getMapper();
+ if (dmapper.canBeRemapped(dpath)) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Remapping " + dest + " to " + source);
+ }
+ dmapper.remap(dpath, source.getMapper().map(source.getPathFromRoot()));
+ dest.closeShallow();
+ }
+ else {
+ if (stack.currentFrame().isDefined("fc")) {
+ FileCopier fc = (FileCopier) stack.currentFrame().getVar("fc");
+ if (!fc.isClosed()) {
+ throw new FutureNotYetAvailable(fc);
+ }
+ else {
+ if (fc.getException() != null) {
+ throw new ExecutionException("Failed to copy " + source + " to " + dest, fc.getException());
+ }
+ }
+ dest.closeShallow();
+ }
+ else {
+ FileCopier fc = new FileCopier(source.getMapper().map(source.getPathFromRoot()),
+ dest.getMapper().map(dpath));
+ stack.setVar("fc", fc);
+ try {
+ fc.start();
+ }
+ catch (Exception e) {
+ throw new ExecutionException("Failed to start file copy", e);
+ }
+ throw new FutureNotYetAvailable(fc);
+ }
+ }
+ }
+
+ private static void copyArray(DSHandle dest, DSHandle source,
+ VariableStack stack, int level) throws ExecutionException {
+ PairIterator it;
+ if (stack.isDefined("it" + level)) {
+ it = (PairIterator) stack.getVar("it" + level);
+ }
+ else {
+ it = new PairIterator(source.getArrayValue());
+ stack.setVar("it" + level, it);
+ }
+ while (it.hasNext()) {
+ Pair pair = (Pair) it.next();
+ Object lhs = pair.get(0);
+ DSHandle rhs = (DSHandle) pair.get(1);
+ Path memberPath;
+ if (lhs instanceof Double) {
+ memberPath = Path.EMPTY_PATH.addLast(String.valueOf(((Double) lhs).intValue()), true);
+ }
+ else {
+ memberPath = Path.EMPTY_PATH.addLast(String.valueOf(lhs), true);
+ }
+ DSHandle field;
+ try {
+ field = dest.getField(memberPath);
+ }
+ catch (InvalidPathException ipe) {
+ throw new ExecutionException("Could not get destination field",ipe);
+ }
+ deepCopy(field, rhs, stack, level + 1);
+ }
+ stack.currentFrame().deleteVar("it" + level);
+ dest.closeShallow();
+ }
}
Modified: branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/VDLFunction.java
===================================================================
--- branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/VDLFunction.java 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/VDLFunction.java 2012-01-22 03:23:13 UTC (rev 5505)
@@ -197,9 +197,15 @@
private static String[] leavesFileNames(DSHandle var) throws ExecutionException, HandleOpenException {
Mapper mapper;
+
synchronized (var.getRoot()) {
mapper = var.getMapper();
}
+
+ if (mapper == null) {
+ throw new ExecutionException(var.getType() + " is not a mapped type");
+ }
+
List<String> l = new ArrayList<String>();
try {
Collection<Path> fp = var.getFringePaths();
Modified: branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/swiftscript/Java.java
===================================================================
--- branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/swiftscript/Java.java 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/swiftscript/Java.java 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,6 +1,7 @@
package org.griphyn.vdl.karajan.lib.swiftscript;
import java.lang.reflect.Method;
+import java.util.Arrays;
import org.globus.cog.karajan.arguments.Arg;
import org.globus.cog.karajan.stack.VariableStack;
@@ -8,78 +9,97 @@
import org.griphyn.vdl.karajan.lib.VDLFunction;
import org.griphyn.vdl.mapping.AbstractDataNode;
import org.griphyn.vdl.mapping.DSHandle;
-import org.griphyn.vdl.mapping.HandleOpenException;
import org.griphyn.vdl.mapping.RootDataNode;
import org.griphyn.vdl.type.Type;
import org.griphyn.vdl.type.Types;
-public class Java extends VDLFunction {
+public class Java extends VDLFunction
+{
- static {
+ static
+ {
setArguments(Java.class, new Arg[] { Arg.VARGS });
}
-
- protected Object function(VariableStack stack) throws ExecutionException {
+
+ protected Object function(VariableStack stack) throws ExecutionException
+ {
AbstractDataNode[] args = waitForAllVargs(stack);
-
- Method method = getMethod(args);
+
+ Method method = getMethod(args);
Object[] p = convertInputs(method, args);
Type type = returnType(method);
Object value = invoke(method, p);
DSHandle result = swiftResult(type, value);
-
+
return result;
}
-
- /**
+
+ /**
Given the user args, locate the Java Method.
*/
- Method getMethod(DSHandle[] args) {
- Method result = null;
- Class clazz;
-
+
+ Method getMethod(DSHandle[] args)
+ {
+ Method result;
+ Class<?> clazz;
+
String lib = "unset";
String name = "unset";
-
+
+ Class[] parameterTypes = new Class[args.length-2];
+
if (args.length < 2)
throw new RuntimeException
- ("@java() requires at least two arguments");
-
- try {
- lib = (String)args[0].getValue();
- name = (String)args[1].getValue();
- clazz = Class.forName(lib);
- Method[] methods = clazz.getMethods();
- result = null;
- for (Method m : methods) {
- if (m.getName().equals(name)) {
- result = m;
- break;
- }
+ ("@java() requires at least two arguments");
+
+ try
+ {
+ lib = (String) args[0].getValue();
+ name = (String) args[1].getValue();
+ clazz = Class.forName(lib);
+
+ for (int i = 2; i < args.length; i++)
+ {
+ Class p = null;
+ Type t = args[i].getType();
+
+ if (t.equals(Types.FLOAT)) p = double.class;
+ else if (t.equals(Types.INT)) p = int.class;
+ else if (t.equals(Types.BOOLEAN)) p = boolean.class;
+ else if (t.equals(Types.STRING)) p = String.class;
+ else throw new RuntimeException("Cannot use @java with non-primitive types");
+
+ parameterTypes[i-2] = p;
}
- }
- catch (Exception e) {
- e.printStackTrace();
+ result = clazz.getMethod(name, parameterTypes);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
throw new RuntimeException
- ("@java(): Error attempting to use: " + args[0]);
+ ("@java(): Error attempting to use: " + args[0].getValue());
}
-
- if (result == null)
+
+ if (result == null)
throw new RuntimeException
- ("No method: " + name + " in " + lib);
+ ("No method: " + name + " in " + lib + "with parameter types" + Arrays.toString(parameterTypes));
+
return result;
}
-
- /**
- Convert the user args to a Java Object array.
+
+ /**
+ Convert the user args to a Java Object array.
*/
- Object[] convertInputs(Method method, DSHandle[] args) {
+ Object[] convertInputs(Method method, DSHandle[] args)
+ {
Object[] result = new Object[args.length-2];
Object a = null;
- try {
- for (int i = 2; i < args.length; i++) {
+ try
+ {
+ for (int i = 2; i < args.length; i++)
+ {
Type t = args[i].getType();
- Object v = args[i].getValue();
+ Object v = args[i].getValue();
if (t.equals(Types.FLOAT))
a = (Double) v;
else if (t.equals(Types.INT))
@@ -88,25 +108,25 @@
a = (Boolean) v;
else if (t.equals(Types.STRING))
a = (String) v;
- result[i-2] = a;
+ result[i-2] = a;
}
}
catch (Exception e) {
e.printStackTrace();
throw new RuntimeException
- ("Error converting input arguments: \n" +
- " to: " + method.getDeclaringClass() +
- "." + method + " \n argument: " + a);
+ ("Error converting input arguments: \n" +
+ " to: " + method.getDeclaringClass() +
+ "." + method + " \n argument: " + a);
}
return result;
}
-
+
Type returnType(Method method) {
Type result = null;
-
- Class rt = method.getReturnType();
+
+ Class<?> rt = method.getReturnType();
if (rt.equals(Double.TYPE))
- result = Types.FLOAT;
+ result = Types.FLOAT;
else if (rt.equals(Integer.TYPE))
result = Types.INT;
else if (rt.equals(Boolean.TYPE))
@@ -115,22 +135,26 @@
result = Types.STRING;
return result;
}
-
- Object invoke(Method method, Object[] p) {
- Object result = null;
- try {
+
+ Object invoke(Method method, Object[] p)
+ {
+ Object result = null;
+ try
+ {
result = method.invoke(null, p);
}
- catch (Exception e) {
- e.printStackTrace();
+ catch (Exception e)
+ {
+ e.printStackTrace();
throw new RuntimeException
- ("Error attempting to invoke: " +
- method.getDeclaringClass() + "." + method);
+ ("Error attempting to invoke: " +
+ method.getDeclaringClass() + "." + method);
}
return result;
}
-
- DSHandle swiftResult(Type type, Object value) {
+
+ DSHandle swiftResult(Type type, Object value)
+ {
DSHandle result = new RootDataNode(type);
result.setValue(value);
result.closeShallow();
Modified: branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/swiftscript/Misc.java
===================================================================
--- branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/swiftscript/Misc.java 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/src/org/griphyn/vdl/karajan/lib/swiftscript/Misc.java 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,6 +1,7 @@
package org.griphyn.vdl.karajan.lib.swiftscript;
import java.io.IOException;
+import java.util.Iterator;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -15,8 +16,8 @@
import org.griphyn.vdl.karajan.lib.VDLFunction;
import org.griphyn.vdl.mapping.AbsFile;
import org.griphyn.vdl.mapping.AbstractDataNode;
-import org.griphyn.vdl.mapping.ArrayDataNode;
import org.griphyn.vdl.mapping.DSHandle;
+import org.griphyn.vdl.mapping.HandleOpenException;
import org.griphyn.vdl.mapping.InvalidPathException;
import org.griphyn.vdl.mapping.Path;
import org.griphyn.vdl.mapping.RootArrayDataNode;
@@ -83,7 +84,23 @@
if (h.getType().isPrimitive()) {
buf.append(o);
}
-
+ else if (h.getType().isArray()) {
+ try {
+ Iterator<DSHandle> i = h.getFields(Path.CHILDREN).iterator();
+ buf.append('[');
+ while (i.hasNext()) {
+ prettyPrint(buf, i.next());
+ if (i.hasNext()) {
+ buf.append(", ");
+ }
+ }
+ buf.append(']');
+ }
+ catch (HandleOpenException e) {
+ }
+ catch (InvalidPathException e) {
+ }
+ }
}
}
Modified: branches/release-0.93.1/src/org/griphyn/vdl/mapping/AbstractDataNode.java
===================================================================
--- branches/release-0.93.1/src/org/griphyn/vdl/mapping/AbstractDataNode.java 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/src/org/griphyn/vdl/mapping/AbstractDataNode.java 2012-01-22 03:23:13 UTC (rev 5505)
@@ -12,7 +12,6 @@
import org.apache.log4j.Logger;
import org.globus.cog.karajan.workflow.futures.Future;
-import org.globus.cog.karajan.workflow.futures.FutureFault;
import org.globus.cog.karajan.workflow.futures.FutureNotYetAvailable;
import org.griphyn.vdl.karajan.DSHandleFutureWrapper;
import org.griphyn.vdl.karajan.FutureTracker;
@@ -199,8 +198,6 @@
return handle;
}
catch (NoSuchFieldException e) {
- logger.warn("could not find variable: " + field.getName() +
- " " + path);
throw new InvalidPathException(path, this);
}
}
@@ -513,7 +510,7 @@
}
}
- protected Mapper getActualMapper() {
+ public Mapper getActualMapper() {
return null;
}
Modified: branches/release-0.93.1/src/org/griphyn/vdl/mapping/RootArrayDataNode.java
===================================================================
--- branches/release-0.93.1/src/org/griphyn/vdl/mapping/RootArrayDataNode.java 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/src/org/griphyn/vdl/mapping/RootArrayDataNode.java 2012-01-22 03:23:13 UTC (rev 5505)
@@ -30,7 +30,7 @@
this.params = params;
if (this.params == null) {
initialized();
- }
+ }
else {
innerInit();
}
@@ -99,11 +99,15 @@
if (initialized) {
return mapper;
}
- assert(waitingMapperParam != null);
- throw new FutureNotYetAvailable(waitingMapperParam.getFutureWrapper());
+ if (waitingMapperParam == null) {
+ return null;
+ }
+ else {
+ throw new FutureNotYetAvailable(waitingMapperParam.getFutureWrapper());
+ }
}
- protected Mapper getActualMapper() {
+ public Mapper getActualMapper() {
return mapper;
}
Modified: branches/release-0.93.1/src/org/griphyn/vdl/mapping/RootDataNode.java
===================================================================
--- branches/release-0.93.1/src/org/griphyn/vdl/mapping/RootDataNode.java 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/src/org/griphyn/vdl/mapping/RootDataNode.java 2012-01-22 03:23:13 UTC (rev 5505)
@@ -209,11 +209,15 @@
if (initialized) {
return mapper;
}
- assert (waitingMapperParam != null);
- throw new FutureNotYetAvailable(waitingMapperParam.getFutureWrapper());
+ if (waitingMapperParam == null) {
+ return null;
+ }
+ else {
+ throw new FutureNotYetAvailable(waitingMapperParam.getFutureWrapper());
+ }
}
- protected Mapper getActualMapper() {
+ public Mapper getActualMapper() {
return mapper;
}
Property changes on: branches/release-0.93.1/tests
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests:4762-4946
+ /branches/release-0.93/tests:5279-5504
/trunk/tests:4762-4946
Modified: branches/release-0.93.1/tests/USAGENOTES.txt
===================================================================
--- branches/release-0.93.1/tests/USAGENOTES.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/USAGENOTES.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -74,6 +74,7 @@
- *.check.sh*
- *.clean.sh*
- *.timeout specifier.*
+- *.repeat (number of times to repeat this test)
The scripts may setup and inspect files in *RUNDIR*
including *exec.out* which must be accessed in *stdout.txt*
Deleted: branches/release-0.93.1/tests/cdm/absolute/100-infullpath-outfullpath.check.sh
===================================================================
--- branches/release-0.93/tests/cdm/absolute/100-infullpath-outfullpath.check.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/100-infullpath-outfullpath.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-for aline in `ls -1 /tmp/outdir`
-do
-theline= echo $aline | cut -c 1-3
-if [ $theline == "out" ]
-then
- ; #pass
-else
- exit 1 #fail
-fi
-
Copied: branches/release-0.93.1/tests/cdm/absolute/100-infullpath-outfullpath.check.sh (from rev 5504, branches/release-0.93/tests/cdm/absolute/100-infullpath-outfullpath.check.sh)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/100-infullpath-outfullpath.check.sh (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/100-infullpath-outfullpath.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+for aline in `ls -1 /tmp/outdir`
+do
+theline= echo $aline | cut -c 1-3
+if [ $theline == "out" ]
+then
+ ; #pass
+else
+ exit 1 #fail
+fi
+
Deleted: branches/release-0.93.1/tests/cdm/absolute/100-infullpath-outfullpath.swift
===================================================================
--- branches/release-0.93/tests/cdm/absolute/100-infullpath-outfullpath.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/100-infullpath-outfullpath.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,19 +0,0 @@
-
-type file;
-
-app (file o) catnap (string _delay, file i)
-{
- catnap _delay @i stdout=@o;
-}
-
-string delay=@arg("s","1");
-
-file data[]<array_mapper; files=["/tmp/indir/data1.txt","/tmp/indir/data2.txt","/tmp/indir/data4.txt","/tmp/indir/data4.txt"]>;
-
-file out[]<array_mapper; files=["/tmp/outdir/out1.data","/tmp/outdir/out2.data","/tmp/outdir/out3.data","/tmp/outdir/out4.data"]>;
-
-
-foreach o, j in out {
- out[j] = catnap(delay,data[j]);
-}
-
Copied: branches/release-0.93.1/tests/cdm/absolute/100-infullpath-outfullpath.swift (from rev 5504, branches/release-0.93/tests/cdm/absolute/100-infullpath-outfullpath.swift)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/100-infullpath-outfullpath.swift (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/100-infullpath-outfullpath.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,19 @@
+
+type file;
+
+app (file o) catnap (string _delay, file i)
+{
+ catnap _delay @i stdout=@o;
+}
+
+string delay=@arg("s","1");
+
+file data[]<array_mapper; files=["/tmp/indir/data1.txt","/tmp/indir/data2.txt","/tmp/indir/data4.txt","/tmp/indir/data4.txt"]>;
+
+file out[]<array_mapper; files=["/tmp/outdir/out1.data","/tmp/outdir/out2.data","/tmp/outdir/out3.data","/tmp/outdir/out4.data"]>;
+
+
+foreach o, j in out {
+ out[j] = catnap(delay,data[j]);
+}
+
Deleted: branches/release-0.93.1/tests/cdm/absolute/200-infullpath-outrelpath.check.sh
===================================================================
Copied: branches/release-0.93.1/tests/cdm/absolute/200-infullpath-outrelpath.check.sh (from rev 5504, branches/release-0.93/tests/cdm/absolute/200-infullpath-outrelpath.check.sh)
===================================================================
Deleted: branches/release-0.93.1/tests/cdm/absolute/200-infullpath-outrelpath.swift
===================================================================
--- branches/release-0.93/tests/cdm/absolute/200-infullpath-outrelpath.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/200-infullpath-outrelpath.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,18 +0,0 @@
-
-type file;
-
-app (file o) catnap (string _delay, file i)
-{
- catnap _delay @i stdout=@o;
-}
-
-string delay=@arg("s","1");
-
-file data[]<array_mapper; files=["/tmp/indir/data1.txt","/tmp/indir/data2.txt","/tmp/indir/data4.txt","/tmp/indir/data4.txt"]>;
-
-file out[]<array_mapper; files=["outdir/out1.data","outdir/out2.data","outdir/out3.data","outdir/out4.data"]>;
-
-foreach o, j in out {
- out[j] = catnap(delay,data[j]);
-}
-
Copied: branches/release-0.93.1/tests/cdm/absolute/200-infullpath-outrelpath.swift (from rev 5504, branches/release-0.93/tests/cdm/absolute/200-infullpath-outrelpath.swift)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/200-infullpath-outrelpath.swift (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/200-infullpath-outrelpath.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,18 @@
+
+type file;
+
+app (file o) catnap (string _delay, file i)
+{
+ catnap _delay @i stdout=@o;
+}
+
+string delay=@arg("s","1");
+
+file data[]<array_mapper; files=["/tmp/indir/data1.txt","/tmp/indir/data2.txt","/tmp/indir/data4.txt","/tmp/indir/data4.txt"]>;
+
+file out[]<array_mapper; files=["outdir/out1.data","outdir/out2.data","outdir/out3.data","outdir/out4.data"]>;
+
+foreach o, j in out {
+ out[j] = catnap(delay,data[j]);
+}
+
Deleted: branches/release-0.93.1/tests/cdm/absolute/300-inrelpath-outfullpath.check.sh
===================================================================
Copied: branches/release-0.93.1/tests/cdm/absolute/300-inrelpath-outfullpath.check.sh (from rev 5504, branches/release-0.93/tests/cdm/absolute/300-inrelpath-outfullpath.check.sh)
===================================================================
Deleted: branches/release-0.93.1/tests/cdm/absolute/300-inrelpath-outfullpath.swift
===================================================================
--- branches/release-0.93/tests/cdm/absolute/300-inrelpath-outfullpath.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/300-inrelpath-outfullpath.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,17 +0,0 @@
-
-type file;
-
-app (file o) catnap (string _delay, file i)
-{
- catnap _delay @i stdout=@o;
-}
-
-string delay=@arg("s","1");
-file data[]<array_mapper; files=["indir/data1.txt","indir/data2.txt","indir/data4.txt","indir/data4.txt"]>;
-
-file out[]<array_mapper; files=["/tmp/outdir/out1.data","/tmp/outdir/out2.data","/tmp/outdir/out3.data","/tmp/outdir/out4.data"]>;
-
-foreach o, j in out {
- out[j] = catnap(delay,data[j]);
-}
-
Copied: branches/release-0.93.1/tests/cdm/absolute/300-inrelpath-outfullpath.swift (from rev 5504, branches/release-0.93/tests/cdm/absolute/300-inrelpath-outfullpath.swift)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/300-inrelpath-outfullpath.swift (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/300-inrelpath-outfullpath.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,17 @@
+
+type file;
+
+app (file o) catnap (string _delay, file i)
+{
+ catnap _delay @i stdout=@o;
+}
+
+string delay=@arg("s","1");
+file data[]<array_mapper; files=["indir/data1.txt","indir/data2.txt","indir/data4.txt","indir/data4.txt"]>;
+
+file out[]<array_mapper; files=["/tmp/outdir/out1.data","/tmp/outdir/out2.data","/tmp/outdir/out3.data","/tmp/outdir/out4.data"]>;
+
+foreach o, j in out {
+ out[j] = catnap(delay,data[j]);
+}
+
Deleted: branches/release-0.93.1/tests/cdm/absolute/400-inrelpath-outrelpath.check.sh
===================================================================
Copied: branches/release-0.93.1/tests/cdm/absolute/400-inrelpath-outrelpath.check.sh (from rev 5504, branches/release-0.93/tests/cdm/absolute/400-inrelpath-outrelpath.check.sh)
===================================================================
Deleted: branches/release-0.93.1/tests/cdm/absolute/400-inrelpath-outrelpath.swift
===================================================================
--- branches/release-0.93/tests/cdm/absolute/400-inrelpath-outrelpath.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/400-inrelpath-outrelpath.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,18 +0,0 @@
-
-type file;
-
-app (file o) catnap (string _delay, file i)
-{
- catnap _delay @i stdout=@o;
-}
-
-string delay=@arg("s","1");
-
-file out[]<array_mapper; files=["outdir/out1.data","outdir/out2.data","outdir/out3.data","outdir/out4.data"]>;
-
-file data[]<array_mapper; files=["indir/data1.txt","indir/data2.txt","indir/data4.txt","indir/data4.txt"]>;
-
-foreach o, j in out {
- out[j] = catnap(delay,data[j]);
-}
-
Copied: branches/release-0.93.1/tests/cdm/absolute/400-inrelpath-outrelpath.swift (from rev 5504, branches/release-0.93/tests/cdm/absolute/400-inrelpath-outrelpath.swift)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/400-inrelpath-outrelpath.swift (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/400-inrelpath-outrelpath.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,18 @@
+
+type file;
+
+app (file o) catnap (string _delay, file i)
+{
+ catnap _delay @i stdout=@o;
+}
+
+string delay=@arg("s","1");
+
+file out[]<array_mapper; files=["outdir/out1.data","outdir/out2.data","outdir/out3.data","outdir/out4.data"]>;
+
+file data[]<array_mapper; files=["indir/data1.txt","indir/data2.txt","indir/data4.txt","indir/data4.txt"]>;
+
+foreach o, j in out {
+ out[j] = catnap(delay,data[j]);
+}
+
Deleted: branches/release-0.93.1/tests/cdm/absolute/README
===================================================================
--- branches/release-0.93/tests/cdm/absolute/README 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/README 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,23 +0,0 @@
-This directory contains testcases to test the Swift CDM for the following cases:
-case 1. When input data is specified as relative or full path name.
-case 2. When the output data is specified as relative or full path name.
-case 3. When the config option wrapper.invocation.mode is set to 'absolute' or 'relative'
-
-The above cases lead to 8 possible combinations of input/output data specification and the wrapper.invocation.mode value.
-
-The naming of swift scripts are given based on how the data is specified:
-
-ff=both input and output data is specified as *fullpaths*
-rf=input data in relative path and output data in fullpath
-fr=input data in full path and output data in relative path
-rr=both input and output data in relative path
-
-Two different versions of config files represent the absolute and relative options for wrapper.invocation.mode:
-cf.absolute
-cf.relative
-
-A run.sh file contains the commandlines to run all the combinations.
-
-You will need to adapt the absolute pathnames in the swift sources based on where you run.
-
-The CDM policy file is fs.data.
Copied: branches/release-0.93.1/tests/cdm/absolute/README (from rev 5504, branches/release-0.93/tests/cdm/absolute/README)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/README (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/README 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,23 @@
+This directory contains testcases to test the Swift CDM for the following cases:
+case 1. When input data is specified as relative or full path name.
+case 2. When the output data is specified as relative or full path name.
+case 3. When the config option wrapper.invocation.mode is set to 'absolute' or 'relative'
+
+The above cases lead to 8 possible combinations of input/output data specification and the wrapper.invocation.mode value.
+
+The naming of swift scripts are given based on how the data is specified:
+
+ff=both input and output data is specified as *fullpaths*
+rf=input data in relative path and output data in fullpath
+fr=input data in full path and output data in relative path
+rr=both input and output data in relative path
+
+Two different versions of config files represent the absolute and relative options for wrapper.invocation.mode:
+cf.absolute
+cf.relative
+
+A run.sh file contains the commandlines to run all the combinations.
+
+You will need to adapt the absolute pathnames in the swift sources based on where you run.
+
+The CDM policy file is fs.data.
Deleted: branches/release-0.93.1/tests/cdm/absolute/basic.swift
===================================================================
--- branches/release-0.93/tests/cdm/absolute/basic.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/basic.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,18 +0,0 @@
-
-type file;
-
-app (file o) catnap (string delay, file i)
-{
- catnap delay @i stdout=@o;
-}
-
-string delay=@arg("s","1");
-
-file out[]<array_mapper; files=["/home/ketan/out1.data","/home/ketan/out2.data","out3.data","out4.data"]>;
-
-file data[]<array_mapper; files=["/home/ketan/data1.txt","data2.txt","/home/ketan/data4.txt","data4.txt"]>;
-
-foreach o, j in out {
- out[j] = catnap(delay,data[j]);
-}
-
Copied: branches/release-0.93.1/tests/cdm/absolute/basic.swift (from rev 5504, branches/release-0.93/tests/cdm/absolute/basic.swift)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/basic.swift (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/basic.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,18 @@
+
+type file;
+
+app (file o) catnap (string delay, file i)
+{
+ catnap delay @i stdout=@o;
+}
+
+string delay=@arg("s","1");
+
+file out[]<array_mapper; files=["/home/ketan/out1.data","/home/ketan/out2.data","out3.data","out4.data"]>;
+
+file data[]<array_mapper; files=["/home/ketan/data1.txt","data2.txt","/home/ketan/data4.txt","data4.txt"]>;
+
+foreach o, j in out {
+ out[j] = catnap(delay,data[j]);
+}
+
Deleted: branches/release-0.93.1/tests/cdm/absolute/catnap.sh
===================================================================
--- branches/release-0.93/tests/cdm/absolute/catnap.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/catnap.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,4 +0,0 @@
-#! /bin/sh
-sleep $1
-shift
-cat $*
Copied: branches/release-0.93.1/tests/cdm/absolute/catnap.sh (from rev 5504, branches/release-0.93/tests/cdm/absolute/catnap.sh)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/catnap.sh (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/catnap.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,4 @@
+#! /bin/sh
+sleep $1
+shift
+cat $*
Deleted: branches/release-0.93.1/tests/cdm/absolute/cf.absolute
===================================================================
--- branches/release-0.93/tests/cdm/absolute/cf.absolute 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/cf.absolute 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,8 +0,0 @@
-wrapperlog.always.transfer=true
-sitedir.keep=true
-execution.retries=0
-lazy.errors=false
-status.mode=provider
-use.provider.staging=false
-provider.staging.pin.swiftfiles=false
-wrapper.invocation.mode=absolute
Copied: branches/release-0.93.1/tests/cdm/absolute/cf.absolute (from rev 5504, branches/release-0.93/tests/cdm/absolute/cf.absolute)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/cf.absolute (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/cf.absolute 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,8 @@
+wrapperlog.always.transfer=true
+sitedir.keep=true
+execution.retries=0
+lazy.errors=false
+status.mode=provider
+use.provider.staging=false
+provider.staging.pin.swiftfiles=false
+wrapper.invocation.mode=absolute
Deleted: branches/release-0.93.1/tests/cdm/absolute/cf.relative
===================================================================
--- branches/release-0.93/tests/cdm/absolute/cf.relative 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/cf.relative 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,8 +0,0 @@
-wrapperlog.always.transfer=true
-sitedir.keep=true
-execution.retries=0
-lazy.errors=false
-status.mode=provider
-use.provider.staging=false
-provider.staging.pin.swiftfiles=false
-wrapper.invocation.mode=relative
Copied: branches/release-0.93.1/tests/cdm/absolute/cf.relative (from rev 5504, branches/release-0.93/tests/cdm/absolute/cf.relative)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/cf.relative (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/cf.relative 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,8 @@
+wrapperlog.always.transfer=true
+sitedir.keep=true
+execution.retries=0
+lazy.errors=false
+status.mode=provider
+use.provider.staging=false
+provider.staging.pin.swiftfiles=false
+wrapper.invocation.mode=relative
Deleted: branches/release-0.93.1/tests/cdm/absolute/clean.sh
===================================================================
--- branches/release-0.93/tests/cdm/absolute/clean.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/clean.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-rm -v outdir/* || exit 1
-
-exit 0
-
Copied: branches/release-0.93.1/tests/cdm/absolute/clean.sh (from rev 5504, branches/release-0.93/tests/cdm/absolute/clean.sh)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/clean.sh (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/clean.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+rm -v outdir/* || exit 1
+
+exit 0
+
Deleted: branches/release-0.93.1/tests/cdm/absolute/data1.txt
===================================================================
--- branches/release-0.93/tests/cdm/absolute/data1.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/data1.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-hello from data1
Copied: branches/release-0.93.1/tests/cdm/absolute/data1.txt (from rev 5504, branches/release-0.93/tests/cdm/absolute/data1.txt)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/data1.txt (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/data1.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+hello from data1
Deleted: branches/release-0.93.1/tests/cdm/absolute/data2.txt
===================================================================
--- branches/release-0.93/tests/cdm/absolute/data2.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/data2.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-hello from data2
Copied: branches/release-0.93.1/tests/cdm/absolute/data2.txt (from rev 5504, branches/release-0.93/tests/cdm/absolute/data2.txt)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/data2.txt (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/data2.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+hello from data2
Deleted: branches/release-0.93.1/tests/cdm/absolute/data3.txt
===================================================================
--- branches/release-0.93/tests/cdm/absolute/data3.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/data3.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-hello from data3
Copied: branches/release-0.93.1/tests/cdm/absolute/data3.txt (from rev 5504, branches/release-0.93/tests/cdm/absolute/data3.txt)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/data3.txt (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/data3.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+hello from data3
Deleted: branches/release-0.93.1/tests/cdm/absolute/data4.txt
===================================================================
--- branches/release-0.93/tests/cdm/absolute/data4.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/data4.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-hello from data4
Copied: branches/release-0.93.1/tests/cdm/absolute/data4.txt (from rev 5504, branches/release-0.93/tests/cdm/absolute/data4.txt)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/data4.txt (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/data4.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+hello from data4
Deleted: branches/release-0.93.1/tests/cdm/absolute/ff.kml
===================================================================
--- branches/release-0.93/tests/cdm/absolute/ff.kml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/ff.kml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,223 +0,0 @@
-<project><!-- CACHE ID 4ce39a0c-5c18-4b47-8d49-6688cfc1844b -->
- <import file="sys.xml"/>
- <import file="scheduler.xml"/>
- <import file="rlog.xml"/>
- <import file="vdl.k"/>
- <types>
- <xs:schema targetNamespace="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:simpleType name="file">
- <xs:restriction base="string"/>
- </xs:simpleType>
- </xs:schema>
- </types>
- <global name="swift#string#17001">
- <vdl:new type="string" value="1" />
- </global>
- <global name="swift#string#17004">
- <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out2.data" />
- </global>
- <global name="swift#string#17000">
- <vdl:new type="string" value="s" />
- </global>
- <global name="swift#string#17010">
- <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data4.txt" />
- </global>
- <global name="swift#string#17006">
- <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out4.data" />
- </global>
- <global name="swift#string#17009">
- <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data2.txt" />
- </global>
- <global name="swift#string#17008">
- <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data1.txt" />
- </global>
- <global name="swift#string#17005">
- <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out3.data" />
- </global>
- <global name="swift#string#17003">
- <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out1.data" />
- </global>
- <element name="catnap" arguments="o,_delay,i">
- <parameterlog>
- <string>input</string>
- <string>_delay</string>
- <vdl:getdatasetprovenanceid var="{_delay}" />
- <string>{#thread}</string>
- </parameterlog>
- <parameterlog>
- <string>input</string>
- <string>i</string>
- <vdl:getdatasetprovenanceid var="{i}" />
- <string>{#thread}</string>
- </parameterlog>
- <parameterlog>
- <string>output</string>
- <string>o</string>
- <vdl:getdatasetprovenanceid var="{o}" />
- <string>{#thread}</string>
- </parameterlog>
- <log level="debug" message="PROCEDURE line=4 thread={#thread} name=catnap"/>
- <vdl:execute>
- <vdl:tr>catnap</vdl:tr>
- <vdl:stagein var="{_delay}"/>
- <vdl:stagein var="{i}"/>
- <vdl:stageout var="{o}"/>
- <vdl:arguments>
- <variable>_delay</variable>
- <swiftscript:filename>
- <variable>i</variable>
- </swiftscript:filename>
- </vdl:arguments>
- <vdl:stdout>
- <swiftscript:filename>
- <variable>o</variable>
- </swiftscript:filename>
- </vdl:stdout>
- </vdl:execute>
- <vdl:closedataset var="{o}"/>
- <log level="debug" message="PROCEDURE_END line=4"/></element>
-
- <set name="delay">
- <vdl:new type="string" dbgname="delay" waitfor="88000" />
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>delay</string>
- <vdl:getdatasetprovenanceid var="{delay}" />
- <string>{#thread}</string>
- </parameterlog>
- <set name="swift#mapper#17002">
- <vdl:new type="string[]" dbgname="swift#mapper#17002" waitfor="" />
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>swift#mapper#17002</string>
- <vdl:getdatasetprovenanceid var="{swift#mapper#17002}" />
- <string>{#thread}</string>
- </parameterlog>
- <set name="out">
- <vdl:new type="file[]" dbgname="out" waitfor="88002">
- <vdl:mapping descriptor="array_mapper">
- <vdl:parameter name="files"><variable>swift#mapper#17002</variable></vdl:parameter>
- </vdl:mapping>
- </vdl:new>
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>out</string>
- <vdl:getdatasetprovenanceid var="{out}" />
- <string>{#thread}</string>
- </parameterlog>
- <set name="swift#mapper#17007">
- <vdl:new type="string[]" dbgname="swift#mapper#17007" waitfor="" />
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>swift#mapper#17007</string>
- <vdl:getdatasetprovenanceid var="{swift#mapper#17007}" />
- <string>{#thread}</string>
- </parameterlog>
- <set name="data">
- <vdl:new type="file[]" dbgname="data">
- <vdl:mapping descriptor="array_mapper">
- <vdl:parameter name="files"><variable>swift#mapper#17007</variable></vdl:parameter>
- <vdl:parameter name="input" value="true" />
- </vdl:mapping>
- </vdl:new>
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>data</string>
- <vdl:getdatasetprovenanceid var="{data}" />
- <string>{#thread}</string>
- </parameterlog>
- <restartLog>
- <vdl:mains>
- <vdl:startprogressticker />
- <vdl:mainp>
- <parallel>
- <sequential>
- <vdl:setfieldvalue>
- <argument name="var">
- <variable>delay</variable>
- </argument>
- <argument name="value">
- <swiftscript:arg>
- <variable>swift#string#17000</variable><variable>swift#string#17001</variable>
- </swiftscript:arg>
- </argument>
- </vdl:setfieldvalue>
- <partialCloseDataset var="{delay}" closeID="88000" />
- </sequential>
- <sequential>
- <vdl:setfieldvalue>
- <argument name="var">
- <variable>swift#mapper#17002</variable>
- </argument>
- <argument name="value">
- <vdl:createarray>
- <list>
- <variable>swift#string#17003</variable>
- <variable>swift#string#17004</variable>
- <variable>swift#string#17005</variable>
- <variable>swift#string#17006</variable>
- </list>
- </vdl:createarray>
- </argument>
- </vdl:setfieldvalue>
- </sequential>
- <sequential>
- <vdl:setfieldvalue>
- <argument name="var">
- <variable>swift#mapper#17007</variable>
- </argument>
- <argument name="value">
- <vdl:createarray>
- <list>
- <variable>swift#string#17008</variable>
- <variable>swift#string#17009</variable>
- <variable>swift#string#17010</variable>
- <variable>swift#string#17010</variable>
- </list>
- </vdl:createarray>
- </argument>
- </vdl:setfieldvalue>
- </sequential>
- <sequential>
- <vdl:tparallelFor name="$" selfClose="true">
- <getarrayiterator><variable>out</variable></getarrayiterator>
- <set names="$$, o">
- <each items="{$}"/>
- </set>
- <set name="j">
- <vdl:new type="int" value="{$$}"/>
- </set> <log level="debug" message="FOREACH_IT_START line=15 thread={#thread}"/>
- <log level="debug"><string>SCOPE thread={#thread}</string></log>
-
- <sequentialWithID>
- <sequential>
- <catnap>
- <parallel>
- <vdl:getfieldsubscript>
- <argument name="var"><variable>out</variable></argument>
- <argument name="subscript"><variable>j</variable></argument>
- </vdl:getfieldsubscript>
- <variable>delay</variable>
- <vdl:getfieldsubscript>
- <argument name="var"><variable>data</variable></argument>
- <argument name="subscript"><variable>j</variable></argument>
- </vdl:getfieldsubscript>
- </parallel>
- </catnap>
- </sequential>
- </sequentialWithID>
- <log level="debug" message="FOREACH_IT_END line=15 thread={#thread}"/>
- </vdl:tparallelFor>
- <partialCloseDataset var="{out}" closeID="88002" />
- </sequential>
- </parallel>
- </vdl:mainp>
- <vdl:stopprogressticker />
- </vdl:mains>
- </restartLog>
-</project>
Copied: branches/release-0.93.1/tests/cdm/absolute/ff.kml (from rev 5504, branches/release-0.93/tests/cdm/absolute/ff.kml)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/ff.kml (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/ff.kml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,223 @@
+<project><!-- CACHE ID 4ce39a0c-5c18-4b47-8d49-6688cfc1844b -->
+ <import file="sys.xml"/>
+ <import file="scheduler.xml"/>
+ <import file="rlog.xml"/>
+ <import file="vdl.k"/>
+ <types>
+ <xs:schema targetNamespace="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:simpleType name="file">
+ <xs:restriction base="string"/>
+ </xs:simpleType>
+ </xs:schema>
+ </types>
+ <global name="swift#string#17001">
+ <vdl:new type="string" value="1" />
+ </global>
+ <global name="swift#string#17004">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out2.data" />
+ </global>
+ <global name="swift#string#17000">
+ <vdl:new type="string" value="s" />
+ </global>
+ <global name="swift#string#17010">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data4.txt" />
+ </global>
+ <global name="swift#string#17006">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out4.data" />
+ </global>
+ <global name="swift#string#17009">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data2.txt" />
+ </global>
+ <global name="swift#string#17008">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data1.txt" />
+ </global>
+ <global name="swift#string#17005">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out3.data" />
+ </global>
+ <global name="swift#string#17003">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out1.data" />
+ </global>
+ <element name="catnap" arguments="o,_delay,i">
+ <parameterlog>
+ <string>input</string>
+ <string>_delay</string>
+ <vdl:getdatasetprovenanceid var="{_delay}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <parameterlog>
+ <string>input</string>
+ <string>i</string>
+ <vdl:getdatasetprovenanceid var="{i}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <parameterlog>
+ <string>output</string>
+ <string>o</string>
+ <vdl:getdatasetprovenanceid var="{o}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <log level="debug" message="PROCEDURE line=4 thread={#thread} name=catnap"/>
+ <vdl:execute>
+ <vdl:tr>catnap</vdl:tr>
+ <vdl:stagein var="{_delay}"/>
+ <vdl:stagein var="{i}"/>
+ <vdl:stageout var="{o}"/>
+ <vdl:arguments>
+ <variable>_delay</variable>
+ <swiftscript:filename>
+ <variable>i</variable>
+ </swiftscript:filename>
+ </vdl:arguments>
+ <vdl:stdout>
+ <swiftscript:filename>
+ <variable>o</variable>
+ </swiftscript:filename>
+ </vdl:stdout>
+ </vdl:execute>
+ <vdl:closedataset var="{o}"/>
+ <log level="debug" message="PROCEDURE_END line=4"/></element>
+
+ <set name="delay">
+ <vdl:new type="string" dbgname="delay" waitfor="88000" />
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>delay</string>
+ <vdl:getdatasetprovenanceid var="{delay}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <set name="swift#mapper#17002">
+ <vdl:new type="string[]" dbgname="swift#mapper#17002" waitfor="" />
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>swift#mapper#17002</string>
+ <vdl:getdatasetprovenanceid var="{swift#mapper#17002}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <set name="out">
+ <vdl:new type="file[]" dbgname="out" waitfor="88002">
+ <vdl:mapping descriptor="array_mapper">
+ <vdl:parameter name="files"><variable>swift#mapper#17002</variable></vdl:parameter>
+ </vdl:mapping>
+ </vdl:new>
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>out</string>
+ <vdl:getdatasetprovenanceid var="{out}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <set name="swift#mapper#17007">
+ <vdl:new type="string[]" dbgname="swift#mapper#17007" waitfor="" />
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>swift#mapper#17007</string>
+ <vdl:getdatasetprovenanceid var="{swift#mapper#17007}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <set name="data">
+ <vdl:new type="file[]" dbgname="data">
+ <vdl:mapping descriptor="array_mapper">
+ <vdl:parameter name="files"><variable>swift#mapper#17007</variable></vdl:parameter>
+ <vdl:parameter name="input" value="true" />
+ </vdl:mapping>
+ </vdl:new>
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>data</string>
+ <vdl:getdatasetprovenanceid var="{data}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <restartLog>
+ <vdl:mains>
+ <vdl:startprogressticker />
+ <vdl:mainp>
+ <parallel>
+ <sequential>
+ <vdl:setfieldvalue>
+ <argument name="var">
+ <variable>delay</variable>
+ </argument>
+ <argument name="value">
+ <swiftscript:arg>
+ <variable>swift#string#17000</variable><variable>swift#string#17001</variable>
+ </swiftscript:arg>
+ </argument>
+ </vdl:setfieldvalue>
+ <partialCloseDataset var="{delay}" closeID="88000" />
+ </sequential>
+ <sequential>
+ <vdl:setfieldvalue>
+ <argument name="var">
+ <variable>swift#mapper#17002</variable>
+ </argument>
+ <argument name="value">
+ <vdl:createarray>
+ <list>
+ <variable>swift#string#17003</variable>
+ <variable>swift#string#17004</variable>
+ <variable>swift#string#17005</variable>
+ <variable>swift#string#17006</variable>
+ </list>
+ </vdl:createarray>
+ </argument>
+ </vdl:setfieldvalue>
+ </sequential>
+ <sequential>
+ <vdl:setfieldvalue>
+ <argument name="var">
+ <variable>swift#mapper#17007</variable>
+ </argument>
+ <argument name="value">
+ <vdl:createarray>
+ <list>
+ <variable>swift#string#17008</variable>
+ <variable>swift#string#17009</variable>
+ <variable>swift#string#17010</variable>
+ <variable>swift#string#17010</variable>
+ </list>
+ </vdl:createarray>
+ </argument>
+ </vdl:setfieldvalue>
+ </sequential>
+ <sequential>
+ <vdl:tparallelFor name="$" selfClose="true">
+ <getarrayiterator><variable>out</variable></getarrayiterator>
+ <set names="$$, o">
+ <each items="{$}"/>
+ </set>
+ <set name="j">
+ <vdl:new type="int" value="{$$}"/>
+ </set> <log level="debug" message="FOREACH_IT_START line=15 thread={#thread}"/>
+ <log level="debug"><string>SCOPE thread={#thread}</string></log>
+
+ <sequentialWithID>
+ <sequential>
+ <catnap>
+ <parallel>
+ <vdl:getfieldsubscript>
+ <argument name="var"><variable>out</variable></argument>
+ <argument name="subscript"><variable>j</variable></argument>
+ </vdl:getfieldsubscript>
+ <variable>delay</variable>
+ <vdl:getfieldsubscript>
+ <argument name="var"><variable>data</variable></argument>
+ <argument name="subscript"><variable>j</variable></argument>
+ </vdl:getfieldsubscript>
+ </parallel>
+ </catnap>
+ </sequential>
+ </sequentialWithID>
+ <log level="debug" message="FOREACH_IT_END line=15 thread={#thread}"/>
+ </vdl:tparallelFor>
+ <partialCloseDataset var="{out}" closeID="88002" />
+ </sequential>
+ </parallel>
+ </vdl:mainp>
+ <vdl:stopprogressticker />
+ </vdl:mains>
+ </restartLog>
+</project>
Deleted: branches/release-0.93.1/tests/cdm/absolute/ff.swift
===================================================================
--- branches/release-0.93/tests/cdm/absolute/ff.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/ff.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,18 +0,0 @@
-
-type file;
-
-app (file o) catnap (string _delay, file i)
-{
- catnap _delay @i stdout=@o;
-}
-
-string delay=@arg("s","1");
-
-file out[]<array_mapper; files=["/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out1.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out2.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out3.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out4.data"]>;
-
-file data[]<array_mapper; files=["/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data1.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data2.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data4.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data4.txt"]>;
-
-foreach o, j in out {
- out[j] = catnap(delay,data[j]);
-}
-
Copied: branches/release-0.93.1/tests/cdm/absolute/ff.swift (from rev 5504, branches/release-0.93/tests/cdm/absolute/ff.swift)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/ff.swift (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/ff.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,18 @@
+
+type file;
+
+app (file o) catnap (string _delay, file i)
+{
+ catnap _delay @i stdout=@o;
+}
+
+string delay=@arg("s","1");
+
+file out[]<array_mapper; files=["/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out1.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out2.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out3.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out4.data"]>;
+
+file data[]<array_mapper; files=["/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data1.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data2.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data4.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data4.txt"]>;
+
+foreach o, j in out {
+ out[j] = catnap(delay,data[j]);
+}
+
Deleted: branches/release-0.93.1/tests/cdm/absolute/fr.kml
===================================================================
--- branches/release-0.93/tests/cdm/absolute/fr.kml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/fr.kml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,223 +0,0 @@
-<project><!-- CACHE ID 4ce39a0c-5c18-4b47-8d49-6688cfc1844b -->
- <import file="sys.xml"/>
- <import file="scheduler.xml"/>
- <import file="rlog.xml"/>
- <import file="vdl.k"/>
- <types>
- <xs:schema targetNamespace="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:simpleType name="file">
- <xs:restriction base="string"/>
- </xs:simpleType>
- </xs:schema>
- </types>
- <global name="swift#string#17001">
- <vdl:new type="string" value="1" />
- </global>
- <global name="swift#string#17000">
- <vdl:new type="string" value="s" />
- </global>
- <global name="swift#string#17010">
- <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data4.txt" />
- </global>
- <global name="swift#string#17006">
- <vdl:new type="string" value="./outdir/out4.data" />
- </global>
- <global name="swift#string#17005">
- <vdl:new type="string" value="./outdir/out3.data" />
- </global>
- <global name="swift#string#17009">
- <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data2.txt" />
- </global>
- <global name="swift#string#17008">
- <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data1.txt" />
- </global>
- <global name="swift#string#17004">
- <vdl:new type="string" value="./outdir/out2.data" />
- </global>
- <global name="swift#string#17003">
- <vdl:new type="string" value="./outdir/out1.data" />
- </global>
- <element name="catnap" arguments="o,_delay,i">
- <parameterlog>
- <string>input</string>
- <string>_delay</string>
- <vdl:getdatasetprovenanceid var="{_delay}" />
- <string>{#thread}</string>
- </parameterlog>
- <parameterlog>
- <string>input</string>
- <string>i</string>
- <vdl:getdatasetprovenanceid var="{i}" />
- <string>{#thread}</string>
- </parameterlog>
- <parameterlog>
- <string>output</string>
- <string>o</string>
- <vdl:getdatasetprovenanceid var="{o}" />
- <string>{#thread}</string>
- </parameterlog>
- <log level="debug" message="PROCEDURE line=4 thread={#thread} name=catnap"/>
- <vdl:execute>
- <vdl:tr>catnap</vdl:tr>
- <vdl:stagein var="{_delay}"/>
- <vdl:stagein var="{i}"/>
- <vdl:stageout var="{o}"/>
- <vdl:arguments>
- <variable>_delay</variable>
- <swiftscript:filename>
- <variable>i</variable>
- </swiftscript:filename>
- </vdl:arguments>
- <vdl:stdout>
- <swiftscript:filename>
- <variable>o</variable>
- </swiftscript:filename>
- </vdl:stdout>
- </vdl:execute>
- <vdl:closedataset var="{o}"/>
- <log level="debug" message="PROCEDURE_END line=4"/></element>
-
- <set name="delay">
- <vdl:new type="string" dbgname="delay" waitfor="88000" />
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>delay</string>
- <vdl:getdatasetprovenanceid var="{delay}" />
- <string>{#thread}</string>
- </parameterlog>
- <set name="swift#mapper#17002">
- <vdl:new type="string[]" dbgname="swift#mapper#17002" waitfor="" />
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>swift#mapper#17002</string>
- <vdl:getdatasetprovenanceid var="{swift#mapper#17002}" />
- <string>{#thread}</string>
- </parameterlog>
- <set name="out">
- <vdl:new type="file[]" dbgname="out" waitfor="88002">
- <vdl:mapping descriptor="array_mapper">
- <vdl:parameter name="files"><variable>swift#mapper#17002</variable></vdl:parameter>
- </vdl:mapping>
- </vdl:new>
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>out</string>
- <vdl:getdatasetprovenanceid var="{out}" />
- <string>{#thread}</string>
- </parameterlog>
- <set name="swift#mapper#17007">
- <vdl:new type="string[]" dbgname="swift#mapper#17007" waitfor="" />
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>swift#mapper#17007</string>
- <vdl:getdatasetprovenanceid var="{swift#mapper#17007}" />
- <string>{#thread}</string>
- </parameterlog>
- <set name="data">
- <vdl:new type="file[]" dbgname="data">
- <vdl:mapping descriptor="array_mapper">
- <vdl:parameter name="files"><variable>swift#mapper#17007</variable></vdl:parameter>
- <vdl:parameter name="input" value="true" />
- </vdl:mapping>
- </vdl:new>
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>data</string>
- <vdl:getdatasetprovenanceid var="{data}" />
- <string>{#thread}</string>
- </parameterlog>
- <restartLog>
- <vdl:mains>
- <vdl:startprogressticker />
- <vdl:mainp>
- <parallel>
- <sequential>
- <vdl:setfieldvalue>
- <argument name="var">
- <variable>delay</variable>
- </argument>
- <argument name="value">
- <swiftscript:arg>
- <variable>swift#string#17000</variable><variable>swift#string#17001</variable>
- </swiftscript:arg>
- </argument>
- </vdl:setfieldvalue>
- <partialCloseDataset var="{delay}" closeID="88000" />
- </sequential>
- <sequential>
- <vdl:setfieldvalue>
- <argument name="var">
- <variable>swift#mapper#17002</variable>
- </argument>
- <argument name="value">
- <vdl:createarray>
- <list>
- <variable>swift#string#17003</variable>
- <variable>swift#string#17004</variable>
- <variable>swift#string#17005</variable>
- <variable>swift#string#17006</variable>
- </list>
- </vdl:createarray>
- </argument>
- </vdl:setfieldvalue>
- </sequential>
- <sequential>
- <vdl:setfieldvalue>
- <argument name="var">
- <variable>swift#mapper#17007</variable>
- </argument>
- <argument name="value">
- <vdl:createarray>
- <list>
- <variable>swift#string#17008</variable>
- <variable>swift#string#17009</variable>
- <variable>swift#string#17010</variable>
- <variable>swift#string#17010</variable>
- </list>
- </vdl:createarray>
- </argument>
- </vdl:setfieldvalue>
- </sequential>
- <sequential>
- <vdl:tparallelFor name="$" selfClose="true">
- <getarrayiterator><variable>out</variable></getarrayiterator>
- <set names="$$, o">
- <each items="{$}"/>
- </set>
- <set name="j">
- <vdl:new type="int" value="{$$}"/>
- </set> <log level="debug" message="FOREACH_IT_START line=15 thread={#thread}"/>
- <log level="debug"><string>SCOPE thread={#thread}</string></log>
-
- <sequentialWithID>
- <sequential>
- <catnap>
- <parallel>
- <vdl:getfieldsubscript>
- <argument name="var"><variable>out</variable></argument>
- <argument name="subscript"><variable>j</variable></argument>
- </vdl:getfieldsubscript>
- <variable>delay</variable>
- <vdl:getfieldsubscript>
- <argument name="var"><variable>data</variable></argument>
- <argument name="subscript"><variable>j</variable></argument>
- </vdl:getfieldsubscript>
- </parallel>
- </catnap>
- </sequential>
- </sequentialWithID>
- <log level="debug" message="FOREACH_IT_END line=15 thread={#thread}"/>
- </vdl:tparallelFor>
- <partialCloseDataset var="{out}" closeID="88002" />
- </sequential>
- </parallel>
- </vdl:mainp>
- <vdl:stopprogressticker />
- </vdl:mains>
- </restartLog>
-</project>
Copied: branches/release-0.93.1/tests/cdm/absolute/fr.kml (from rev 5504, branches/release-0.93/tests/cdm/absolute/fr.kml)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/fr.kml (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/fr.kml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,223 @@
+<project><!-- CACHE ID 4ce39a0c-5c18-4b47-8d49-6688cfc1844b -->
+ <import file="sys.xml"/>
+ <import file="scheduler.xml"/>
+ <import file="rlog.xml"/>
+ <import file="vdl.k"/>
+ <types>
+ <xs:schema targetNamespace="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:simpleType name="file">
+ <xs:restriction base="string"/>
+ </xs:simpleType>
+ </xs:schema>
+ </types>
+ <global name="swift#string#17001">
+ <vdl:new type="string" value="1" />
+ </global>
+ <global name="swift#string#17000">
+ <vdl:new type="string" value="s" />
+ </global>
+ <global name="swift#string#17010">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data4.txt" />
+ </global>
+ <global name="swift#string#17006">
+ <vdl:new type="string" value="./outdir/out4.data" />
+ </global>
+ <global name="swift#string#17005">
+ <vdl:new type="string" value="./outdir/out3.data" />
+ </global>
+ <global name="swift#string#17009">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data2.txt" />
+ </global>
+ <global name="swift#string#17008">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data1.txt" />
+ </global>
+ <global name="swift#string#17004">
+ <vdl:new type="string" value="./outdir/out2.data" />
+ </global>
+ <global name="swift#string#17003">
+ <vdl:new type="string" value="./outdir/out1.data" />
+ </global>
+ <element name="catnap" arguments="o,_delay,i">
+ <parameterlog>
+ <string>input</string>
+ <string>_delay</string>
+ <vdl:getdatasetprovenanceid var="{_delay}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <parameterlog>
+ <string>input</string>
+ <string>i</string>
+ <vdl:getdatasetprovenanceid var="{i}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <parameterlog>
+ <string>output</string>
+ <string>o</string>
+ <vdl:getdatasetprovenanceid var="{o}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <log level="debug" message="PROCEDURE line=4 thread={#thread} name=catnap"/>
+ <vdl:execute>
+ <vdl:tr>catnap</vdl:tr>
+ <vdl:stagein var="{_delay}"/>
+ <vdl:stagein var="{i}"/>
+ <vdl:stageout var="{o}"/>
+ <vdl:arguments>
+ <variable>_delay</variable>
+ <swiftscript:filename>
+ <variable>i</variable>
+ </swiftscript:filename>
+ </vdl:arguments>
+ <vdl:stdout>
+ <swiftscript:filename>
+ <variable>o</variable>
+ </swiftscript:filename>
+ </vdl:stdout>
+ </vdl:execute>
+ <vdl:closedataset var="{o}"/>
+ <log level="debug" message="PROCEDURE_END line=4"/></element>
+
+ <set name="delay">
+ <vdl:new type="string" dbgname="delay" waitfor="88000" />
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>delay</string>
+ <vdl:getdatasetprovenanceid var="{delay}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <set name="swift#mapper#17002">
+ <vdl:new type="string[]" dbgname="swift#mapper#17002" waitfor="" />
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>swift#mapper#17002</string>
+ <vdl:getdatasetprovenanceid var="{swift#mapper#17002}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <set name="out">
+ <vdl:new type="file[]" dbgname="out" waitfor="88002">
+ <vdl:mapping descriptor="array_mapper">
+ <vdl:parameter name="files"><variable>swift#mapper#17002</variable></vdl:parameter>
+ </vdl:mapping>
+ </vdl:new>
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>out</string>
+ <vdl:getdatasetprovenanceid var="{out}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <set name="swift#mapper#17007">
+ <vdl:new type="string[]" dbgname="swift#mapper#17007" waitfor="" />
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>swift#mapper#17007</string>
+ <vdl:getdatasetprovenanceid var="{swift#mapper#17007}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <set name="data">
+ <vdl:new type="file[]" dbgname="data">
+ <vdl:mapping descriptor="array_mapper">
+ <vdl:parameter name="files"><variable>swift#mapper#17007</variable></vdl:parameter>
+ <vdl:parameter name="input" value="true" />
+ </vdl:mapping>
+ </vdl:new>
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>data</string>
+ <vdl:getdatasetprovenanceid var="{data}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <restartLog>
+ <vdl:mains>
+ <vdl:startprogressticker />
+ <vdl:mainp>
+ <parallel>
+ <sequential>
+ <vdl:setfieldvalue>
+ <argument name="var">
+ <variable>delay</variable>
+ </argument>
+ <argument name="value">
+ <swiftscript:arg>
+ <variable>swift#string#17000</variable><variable>swift#string#17001</variable>
+ </swiftscript:arg>
+ </argument>
+ </vdl:setfieldvalue>
+ <partialCloseDataset var="{delay}" closeID="88000" />
+ </sequential>
+ <sequential>
+ <vdl:setfieldvalue>
+ <argument name="var">
+ <variable>swift#mapper#17002</variable>
+ </argument>
+ <argument name="value">
+ <vdl:createarray>
+ <list>
+ <variable>swift#string#17003</variable>
+ <variable>swift#string#17004</variable>
+ <variable>swift#string#17005</variable>
+ <variable>swift#string#17006</variable>
+ </list>
+ </vdl:createarray>
+ </argument>
+ </vdl:setfieldvalue>
+ </sequential>
+ <sequential>
+ <vdl:setfieldvalue>
+ <argument name="var">
+ <variable>swift#mapper#17007</variable>
+ </argument>
+ <argument name="value">
+ <vdl:createarray>
+ <list>
+ <variable>swift#string#17008</variable>
+ <variable>swift#string#17009</variable>
+ <variable>swift#string#17010</variable>
+ <variable>swift#string#17010</variable>
+ </list>
+ </vdl:createarray>
+ </argument>
+ </vdl:setfieldvalue>
+ </sequential>
+ <sequential>
+ <vdl:tparallelFor name="$" selfClose="true">
+ <getarrayiterator><variable>out</variable></getarrayiterator>
+ <set names="$$, o">
+ <each items="{$}"/>
+ </set>
+ <set name="j">
+ <vdl:new type="int" value="{$$}"/>
+ </set> <log level="debug" message="FOREACH_IT_START line=15 thread={#thread}"/>
+ <log level="debug"><string>SCOPE thread={#thread}</string></log>
+
+ <sequentialWithID>
+ <sequential>
+ <catnap>
+ <parallel>
+ <vdl:getfieldsubscript>
+ <argument name="var"><variable>out</variable></argument>
+ <argument name="subscript"><variable>j</variable></argument>
+ </vdl:getfieldsubscript>
+ <variable>delay</variable>
+ <vdl:getfieldsubscript>
+ <argument name="var"><variable>data</variable></argument>
+ <argument name="subscript"><variable>j</variable></argument>
+ </vdl:getfieldsubscript>
+ </parallel>
+ </catnap>
+ </sequential>
+ </sequentialWithID>
+ <log level="debug" message="FOREACH_IT_END line=15 thread={#thread}"/>
+ </vdl:tparallelFor>
+ <partialCloseDataset var="{out}" closeID="88002" />
+ </sequential>
+ </parallel>
+ </vdl:mainp>
+ <vdl:stopprogressticker />
+ </vdl:mains>
+ </restartLog>
+</project>
Deleted: branches/release-0.93.1/tests/cdm/absolute/fr.swift
===================================================================
--- branches/release-0.93/tests/cdm/absolute/fr.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/fr.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,18 +0,0 @@
-
-type file;
-
-app (file o) catnap (string _delay, file i)
-{
- catnap _delay @i stdout=@o;
-}
-
-string delay=@arg("s","1");
-
-file out[]<array_mapper; files=["./outdir/out1.data","./outdir/out2.data","./outdir/out3.data","./outdir/out4.data"]>;
-
-file data[]<array_mapper; files=["/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data1.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data2.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data4.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data4.txt"]>;
-
-foreach o, j in out {
- out[j] = catnap(delay,data[j]);
-}
-
Copied: branches/release-0.93.1/tests/cdm/absolute/fr.swift (from rev 5504, branches/release-0.93/tests/cdm/absolute/fr.swift)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/fr.swift (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/fr.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,18 @@
+
+type file;
+
+app (file o) catnap (string _delay, file i)
+{
+ catnap _delay @i stdout=@o;
+}
+
+string delay=@arg("s","1");
+
+file out[]<array_mapper; files=["./outdir/out1.data","./outdir/out2.data","./outdir/out3.data","./outdir/out4.data"]>;
+
+file data[]<array_mapper; files=["/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data1.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data2.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data4.txt","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/indir/data4.txt"]>;
+
+foreach o, j in out {
+ out[j] = catnap(delay,data[j]);
+}
+
Deleted: branches/release-0.93.1/tests/cdm/absolute/fs.data
===================================================================
--- branches/release-0.93/tests/cdm/absolute/fs.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/fs.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,2 +0,0 @@
-rule \./outdir/.* DIRECT /home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute
-rule \./indir/.* DIRECT /home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute
Copied: branches/release-0.93.1/tests/cdm/absolute/fs.data (from rev 5504, branches/release-0.93/tests/cdm/absolute/fs.data)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/fs.data (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/fs.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,2 @@
+rule \./outdir/.* DIRECT /home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute
+rule \./indir/.* DIRECT /home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute
Deleted: branches/release-0.93.1/tests/cdm/absolute/indir/data1.txt
===================================================================
--- branches/release-0.93/tests/cdm/absolute/indir/data1.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/indir/data1.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-hello from data1
Copied: branches/release-0.93.1/tests/cdm/absolute/indir/data1.txt (from rev 5504, branches/release-0.93/tests/cdm/absolute/indir/data1.txt)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/indir/data1.txt (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/indir/data1.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+hello from data1
Deleted: branches/release-0.93.1/tests/cdm/absolute/indir/data2.txt
===================================================================
--- branches/release-0.93/tests/cdm/absolute/indir/data2.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/indir/data2.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-hello from data2
Copied: branches/release-0.93.1/tests/cdm/absolute/indir/data2.txt (from rev 5504, branches/release-0.93/tests/cdm/absolute/indir/data2.txt)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/indir/data2.txt (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/indir/data2.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+hello from data2
Deleted: branches/release-0.93.1/tests/cdm/absolute/indir/data3.txt
===================================================================
--- branches/release-0.93/tests/cdm/absolute/indir/data3.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/indir/data3.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-hello from data3
Copied: branches/release-0.93.1/tests/cdm/absolute/indir/data3.txt (from rev 5504, branches/release-0.93/tests/cdm/absolute/indir/data3.txt)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/indir/data3.txt (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/indir/data3.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+hello from data3
Deleted: branches/release-0.93.1/tests/cdm/absolute/indir/data4.txt
===================================================================
--- branches/release-0.93/tests/cdm/absolute/indir/data4.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/indir/data4.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-hello from data4
Copied: branches/release-0.93.1/tests/cdm/absolute/indir/data4.txt (from rev 5504, branches/release-0.93/tests/cdm/absolute/indir/data4.txt)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/indir/data4.txt (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/indir/data4.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+hello from data4
Deleted: branches/release-0.93.1/tests/cdm/absolute/out1.data
===================================================================
--- branches/release-0.93/tests/cdm/absolute/out1.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/out1.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-hello from data1
Copied: branches/release-0.93.1/tests/cdm/absolute/out1.data (from rev 5504, branches/release-0.93/tests/cdm/absolute/out1.data)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/out1.data (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/out1.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+hello from data1
Deleted: branches/release-0.93.1/tests/cdm/absolute/out2.data
===================================================================
--- branches/release-0.93/tests/cdm/absolute/out2.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/out2.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-hello from data2
Copied: branches/release-0.93.1/tests/cdm/absolute/out2.data (from rev 5504, branches/release-0.93/tests/cdm/absolute/out2.data)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/out2.data (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/out2.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+hello from data2
Deleted: branches/release-0.93.1/tests/cdm/absolute/out3.data
===================================================================
--- branches/release-0.93/tests/cdm/absolute/out3.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/out3.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-hello from data4
Copied: branches/release-0.93.1/tests/cdm/absolute/out3.data (from rev 5504, branches/release-0.93/tests/cdm/absolute/out3.data)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/out3.data (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/out3.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+hello from data4
Deleted: branches/release-0.93.1/tests/cdm/absolute/out4.data
===================================================================
--- branches/release-0.93/tests/cdm/absolute/out4.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/out4.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-hello from data4
Copied: branches/release-0.93.1/tests/cdm/absolute/out4.data (from rev 5504, branches/release-0.93/tests/cdm/absolute/out4.data)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/out4.data (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/out4.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+hello from data4
Deleted: branches/release-0.93.1/tests/cdm/absolute/rf.kml
===================================================================
--- branches/release-0.93/tests/cdm/absolute/rf.kml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/rf.kml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,223 +0,0 @@
-<project><!-- CACHE ID 4ce39a0c-5c18-4b47-8d49-6688cfc1844b -->
- <import file="sys.xml"/>
- <import file="scheduler.xml"/>
- <import file="rlog.xml"/>
- <import file="vdl.k"/>
- <types>
- <xs:schema targetNamespace="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:simpleType name="file">
- <xs:restriction base="string"/>
- </xs:simpleType>
- </xs:schema>
- </types>
- <global name="swift#string#17008">
- <vdl:new type="string" value="./indir/data1.txt" />
- </global>
- <global name="swift#string#17001">
- <vdl:new type="string" value="1" />
- </global>
- <global name="swift#string#17004">
- <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out2.data" />
- </global>
- <global name="swift#string#17000">
- <vdl:new type="string" value="s" />
- </global>
- <global name="swift#string#17010">
- <vdl:new type="string" value="./indir/data4.txt" />
- </global>
- <global name="swift#string#17009">
- <vdl:new type="string" value="./indir/data2.txt" />
- </global>
- <global name="swift#string#17006">
- <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out4.data" />
- </global>
- <global name="swift#string#17005">
- <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out3.data" />
- </global>
- <global name="swift#string#17003">
- <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out1.data" />
- </global>
- <element name="catnap" arguments="o,_delay,i">
- <parameterlog>
- <string>input</string>
- <string>_delay</string>
- <vdl:getdatasetprovenanceid var="{_delay}" />
- <string>{#thread}</string>
- </parameterlog>
- <parameterlog>
- <string>input</string>
- <string>i</string>
- <vdl:getdatasetprovenanceid var="{i}" />
- <string>{#thread}</string>
- </parameterlog>
- <parameterlog>
- <string>output</string>
- <string>o</string>
- <vdl:getdatasetprovenanceid var="{o}" />
- <string>{#thread}</string>
- </parameterlog>
- <log level="debug" message="PROCEDURE line=4 thread={#thread} name=catnap"/>
- <vdl:execute>
- <vdl:tr>catnap</vdl:tr>
- <vdl:stagein var="{_delay}"/>
- <vdl:stagein var="{i}"/>
- <vdl:stageout var="{o}"/>
- <vdl:arguments>
- <variable>_delay</variable>
- <swiftscript:filename>
- <variable>i</variable>
- </swiftscript:filename>
- </vdl:arguments>
- <vdl:stdout>
- <swiftscript:filename>
- <variable>o</variable>
- </swiftscript:filename>
- </vdl:stdout>
- </vdl:execute>
- <vdl:closedataset var="{o}"/>
- <log level="debug" message="PROCEDURE_END line=4"/></element>
-
- <set name="delay">
- <vdl:new type="string" dbgname="delay" waitfor="88000" />
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>delay</string>
- <vdl:getdatasetprovenanceid var="{delay}" />
- <string>{#thread}</string>
- </parameterlog>
- <set name="swift#mapper#17002">
- <vdl:new type="string[]" dbgname="swift#mapper#17002" waitfor="" />
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>swift#mapper#17002</string>
- <vdl:getdatasetprovenanceid var="{swift#mapper#17002}" />
- <string>{#thread}</string>
- </parameterlog>
- <set name="out">
- <vdl:new type="file[]" dbgname="out" waitfor="88002">
- <vdl:mapping descriptor="array_mapper">
- <vdl:parameter name="files"><variable>swift#mapper#17002</variable></vdl:parameter>
- </vdl:mapping>
- </vdl:new>
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>out</string>
- <vdl:getdatasetprovenanceid var="{out}" />
- <string>{#thread}</string>
- </parameterlog>
- <set name="swift#mapper#17007">
- <vdl:new type="string[]" dbgname="swift#mapper#17007" waitfor="" />
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>swift#mapper#17007</string>
- <vdl:getdatasetprovenanceid var="{swift#mapper#17007}" />
- <string>{#thread}</string>
- </parameterlog>
- <set name="data">
- <vdl:new type="file[]" dbgname="data">
- <vdl:mapping descriptor="array_mapper">
- <vdl:parameter name="files"><variable>swift#mapper#17007</variable></vdl:parameter>
- <vdl:parameter name="input" value="true" />
- </vdl:mapping>
- </vdl:new>
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>data</string>
- <vdl:getdatasetprovenanceid var="{data}" />
- <string>{#thread}</string>
- </parameterlog>
- <restartLog>
- <vdl:mains>
- <vdl:startprogressticker />
- <vdl:mainp>
- <parallel>
- <sequential>
- <vdl:setfieldvalue>
- <argument name="var">
- <variable>delay</variable>
- </argument>
- <argument name="value">
- <swiftscript:arg>
- <variable>swift#string#17000</variable><variable>swift#string#17001</variable>
- </swiftscript:arg>
- </argument>
- </vdl:setfieldvalue>
- <partialCloseDataset var="{delay}" closeID="88000" />
- </sequential>
- <sequential>
- <vdl:setfieldvalue>
- <argument name="var">
- <variable>swift#mapper#17002</variable>
- </argument>
- <argument name="value">
- <vdl:createarray>
- <list>
- <variable>swift#string#17003</variable>
- <variable>swift#string#17004</variable>
- <variable>swift#string#17005</variable>
- <variable>swift#string#17006</variable>
- </list>
- </vdl:createarray>
- </argument>
- </vdl:setfieldvalue>
- </sequential>
- <sequential>
- <vdl:setfieldvalue>
- <argument name="var">
- <variable>swift#mapper#17007</variable>
- </argument>
- <argument name="value">
- <vdl:createarray>
- <list>
- <variable>swift#string#17008</variable>
- <variable>swift#string#17009</variable>
- <variable>swift#string#17010</variable>
- <variable>swift#string#17010</variable>
- </list>
- </vdl:createarray>
- </argument>
- </vdl:setfieldvalue>
- </sequential>
- <sequential>
- <vdl:tparallelFor name="$" selfClose="true">
- <getarrayiterator><variable>out</variable></getarrayiterator>
- <set names="$$, o">
- <each items="{$}"/>
- </set>
- <set name="j">
- <vdl:new type="int" value="{$$}"/>
- </set> <log level="debug" message="FOREACH_IT_START line=15 thread={#thread}"/>
- <log level="debug"><string>SCOPE thread={#thread}</string></log>
-
- <sequentialWithID>
- <sequential>
- <catnap>
- <parallel>
- <vdl:getfieldsubscript>
- <argument name="var"><variable>out</variable></argument>
- <argument name="subscript"><variable>j</variable></argument>
- </vdl:getfieldsubscript>
- <variable>delay</variable>
- <vdl:getfieldsubscript>
- <argument name="var"><variable>data</variable></argument>
- <argument name="subscript"><variable>j</variable></argument>
- </vdl:getfieldsubscript>
- </parallel>
- </catnap>
- </sequential>
- </sequentialWithID>
- <log level="debug" message="FOREACH_IT_END line=15 thread={#thread}"/>
- </vdl:tparallelFor>
- <partialCloseDataset var="{out}" closeID="88002" />
- </sequential>
- </parallel>
- </vdl:mainp>
- <vdl:stopprogressticker />
- </vdl:mains>
- </restartLog>
-</project>
Copied: branches/release-0.93.1/tests/cdm/absolute/rf.kml (from rev 5504, branches/release-0.93/tests/cdm/absolute/rf.kml)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/rf.kml (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/rf.kml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,223 @@
+<project><!-- CACHE ID 4ce39a0c-5c18-4b47-8d49-6688cfc1844b -->
+ <import file="sys.xml"/>
+ <import file="scheduler.xml"/>
+ <import file="rlog.xml"/>
+ <import file="vdl.k"/>
+ <types>
+ <xs:schema targetNamespace="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:simpleType name="file">
+ <xs:restriction base="string"/>
+ </xs:simpleType>
+ </xs:schema>
+ </types>
+ <global name="swift#string#17008">
+ <vdl:new type="string" value="./indir/data1.txt" />
+ </global>
+ <global name="swift#string#17001">
+ <vdl:new type="string" value="1" />
+ </global>
+ <global name="swift#string#17004">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out2.data" />
+ </global>
+ <global name="swift#string#17000">
+ <vdl:new type="string" value="s" />
+ </global>
+ <global name="swift#string#17010">
+ <vdl:new type="string" value="./indir/data4.txt" />
+ </global>
+ <global name="swift#string#17009">
+ <vdl:new type="string" value="./indir/data2.txt" />
+ </global>
+ <global name="swift#string#17006">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out4.data" />
+ </global>
+ <global name="swift#string#17005">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out3.data" />
+ </global>
+ <global name="swift#string#17003">
+ <vdl:new type="string" value="/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out1.data" />
+ </global>
+ <element name="catnap" arguments="o,_delay,i">
+ <parameterlog>
+ <string>input</string>
+ <string>_delay</string>
+ <vdl:getdatasetprovenanceid var="{_delay}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <parameterlog>
+ <string>input</string>
+ <string>i</string>
+ <vdl:getdatasetprovenanceid var="{i}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <parameterlog>
+ <string>output</string>
+ <string>o</string>
+ <vdl:getdatasetprovenanceid var="{o}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <log level="debug" message="PROCEDURE line=4 thread={#thread} name=catnap"/>
+ <vdl:execute>
+ <vdl:tr>catnap</vdl:tr>
+ <vdl:stagein var="{_delay}"/>
+ <vdl:stagein var="{i}"/>
+ <vdl:stageout var="{o}"/>
+ <vdl:arguments>
+ <variable>_delay</variable>
+ <swiftscript:filename>
+ <variable>i</variable>
+ </swiftscript:filename>
+ </vdl:arguments>
+ <vdl:stdout>
+ <swiftscript:filename>
+ <variable>o</variable>
+ </swiftscript:filename>
+ </vdl:stdout>
+ </vdl:execute>
+ <vdl:closedataset var="{o}"/>
+ <log level="debug" message="PROCEDURE_END line=4"/></element>
+
+ <set name="delay">
+ <vdl:new type="string" dbgname="delay" waitfor="88000" />
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>delay</string>
+ <vdl:getdatasetprovenanceid var="{delay}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <set name="swift#mapper#17002">
+ <vdl:new type="string[]" dbgname="swift#mapper#17002" waitfor="" />
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>swift#mapper#17002</string>
+ <vdl:getdatasetprovenanceid var="{swift#mapper#17002}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <set name="out">
+ <vdl:new type="file[]" dbgname="out" waitfor="88002">
+ <vdl:mapping descriptor="array_mapper">
+ <vdl:parameter name="files"><variable>swift#mapper#17002</variable></vdl:parameter>
+ </vdl:mapping>
+ </vdl:new>
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>out</string>
+ <vdl:getdatasetprovenanceid var="{out}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <set name="swift#mapper#17007">
+ <vdl:new type="string[]" dbgname="swift#mapper#17007" waitfor="" />
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>swift#mapper#17007</string>
+ <vdl:getdatasetprovenanceid var="{swift#mapper#17007}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <set name="data">
+ <vdl:new type="file[]" dbgname="data">
+ <vdl:mapping descriptor="array_mapper">
+ <vdl:parameter name="files"><variable>swift#mapper#17007</variable></vdl:parameter>
+ <vdl:parameter name="input" value="true" />
+ </vdl:mapping>
+ </vdl:new>
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>data</string>
+ <vdl:getdatasetprovenanceid var="{data}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <restartLog>
+ <vdl:mains>
+ <vdl:startprogressticker />
+ <vdl:mainp>
+ <parallel>
+ <sequential>
+ <vdl:setfieldvalue>
+ <argument name="var">
+ <variable>delay</variable>
+ </argument>
+ <argument name="value">
+ <swiftscript:arg>
+ <variable>swift#string#17000</variable><variable>swift#string#17001</variable>
+ </swiftscript:arg>
+ </argument>
+ </vdl:setfieldvalue>
+ <partialCloseDataset var="{delay}" closeID="88000" />
+ </sequential>
+ <sequential>
+ <vdl:setfieldvalue>
+ <argument name="var">
+ <variable>swift#mapper#17002</variable>
+ </argument>
+ <argument name="value">
+ <vdl:createarray>
+ <list>
+ <variable>swift#string#17003</variable>
+ <variable>swift#string#17004</variable>
+ <variable>swift#string#17005</variable>
+ <variable>swift#string#17006</variable>
+ </list>
+ </vdl:createarray>
+ </argument>
+ </vdl:setfieldvalue>
+ </sequential>
+ <sequential>
+ <vdl:setfieldvalue>
+ <argument name="var">
+ <variable>swift#mapper#17007</variable>
+ </argument>
+ <argument name="value">
+ <vdl:createarray>
+ <list>
+ <variable>swift#string#17008</variable>
+ <variable>swift#string#17009</variable>
+ <variable>swift#string#17010</variable>
+ <variable>swift#string#17010</variable>
+ </list>
+ </vdl:createarray>
+ </argument>
+ </vdl:setfieldvalue>
+ </sequential>
+ <sequential>
+ <vdl:tparallelFor name="$" selfClose="true">
+ <getarrayiterator><variable>out</variable></getarrayiterator>
+ <set names="$$, o">
+ <each items="{$}"/>
+ </set>
+ <set name="j">
+ <vdl:new type="int" value="{$$}"/>
+ </set> <log level="debug" message="FOREACH_IT_START line=15 thread={#thread}"/>
+ <log level="debug"><string>SCOPE thread={#thread}</string></log>
+
+ <sequentialWithID>
+ <sequential>
+ <catnap>
+ <parallel>
+ <vdl:getfieldsubscript>
+ <argument name="var"><variable>out</variable></argument>
+ <argument name="subscript"><variable>j</variable></argument>
+ </vdl:getfieldsubscript>
+ <variable>delay</variable>
+ <vdl:getfieldsubscript>
+ <argument name="var"><variable>data</variable></argument>
+ <argument name="subscript"><variable>j</variable></argument>
+ </vdl:getfieldsubscript>
+ </parallel>
+ </catnap>
+ </sequential>
+ </sequentialWithID>
+ <log level="debug" message="FOREACH_IT_END line=15 thread={#thread}"/>
+ </vdl:tparallelFor>
+ <partialCloseDataset var="{out}" closeID="88002" />
+ </sequential>
+ </parallel>
+ </vdl:mainp>
+ <vdl:stopprogressticker />
+ </vdl:mains>
+ </restartLog>
+</project>
Deleted: branches/release-0.93.1/tests/cdm/absolute/rf.swift
===================================================================
--- branches/release-0.93/tests/cdm/absolute/rf.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/rf.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,18 +0,0 @@
-
-type file;
-
-app (file o) catnap (string _delay, file i)
-{
- catnap _delay @i stdout=@o;
-}
-
-string delay=@arg("s","1");
-
-file out[]<array_mapper; files=["/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out1.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out2.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out3.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out4.data"]>;
-
-file data[]<array_mapper; files=["./indir/data1.txt","./indir/data2.txt","./indir/data4.txt","./indir/data4.txt"]>;
-
-foreach o, j in out {
- out[j] = catnap(delay,data[j]);
-}
-
Copied: branches/release-0.93.1/tests/cdm/absolute/rf.swift (from rev 5504, branches/release-0.93/tests/cdm/absolute/rf.swift)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/rf.swift (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/rf.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,18 @@
+
+type file;
+
+app (file o) catnap (string _delay, file i)
+{
+ catnap _delay @i stdout=@o;
+}
+
+string delay=@arg("s","1");
+
+file out[]<array_mapper; files=["/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out1.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out2.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out3.data","/home/ketan/swift-install/0.93/cog/modules/swift/tests/cdm/absolute/outdir/out4.data"]>;
+
+file data[]<array_mapper; files=["./indir/data1.txt","./indir/data2.txt","./indir/data4.txt","./indir/data4.txt"]>;
+
+foreach o, j in out {
+ out[j] = catnap(delay,data[j]);
+}
+
Deleted: branches/release-0.93.1/tests/cdm/absolute/rr.kml
===================================================================
--- branches/release-0.93/tests/cdm/absolute/rr.kml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/rr.kml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,223 +0,0 @@
-<project><!-- CACHE ID 4ce39a0c-5c18-4b47-8d49-6688cfc1844b -->
- <import file="sys.xml"/>
- <import file="scheduler.xml"/>
- <import file="rlog.xml"/>
- <import file="vdl.k"/>
- <types>
- <xs:schema targetNamespace="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:simpleType name="file">
- <xs:restriction base="string"/>
- </xs:simpleType>
- </xs:schema>
- </types>
- <global name="swift#string#17008">
- <vdl:new type="string" value="./indir/data1.txt" />
- </global>
- <global name="swift#string#17001">
- <vdl:new type="string" value="1" />
- </global>
- <global name="swift#string#17000">
- <vdl:new type="string" value="s" />
- </global>
- <global name="swift#string#17010">
- <vdl:new type="string" value="./indir/data4.txt" />
- </global>
- <global name="swift#string#17006">
- <vdl:new type="string" value="./outdir/out4.data" />
- </global>
- <global name="swift#string#17009">
- <vdl:new type="string" value="./indir/data2.txt" />
- </global>
- <global name="swift#string#17005">
- <vdl:new type="string" value="./outdir/out3.data" />
- </global>
- <global name="swift#string#17004">
- <vdl:new type="string" value="./outdir/out2.data" />
- </global>
- <global name="swift#string#17003">
- <vdl:new type="string" value="./outdir/out1.data" />
- </global>
- <element name="catnap" arguments="o,_delay,i">
- <parameterlog>
- <string>input</string>
- <string>_delay</string>
- <vdl:getdatasetprovenanceid var="{_delay}" />
- <string>{#thread}</string>
- </parameterlog>
- <parameterlog>
- <string>input</string>
- <string>i</string>
- <vdl:getdatasetprovenanceid var="{i}" />
- <string>{#thread}</string>
- </parameterlog>
- <parameterlog>
- <string>output</string>
- <string>o</string>
- <vdl:getdatasetprovenanceid var="{o}" />
- <string>{#thread}</string>
- </parameterlog>
- <log level="debug" message="PROCEDURE line=4 thread={#thread} name=catnap"/>
- <vdl:execute>
- <vdl:tr>catnap</vdl:tr>
- <vdl:stagein var="{_delay}"/>
- <vdl:stagein var="{i}"/>
- <vdl:stageout var="{o}"/>
- <vdl:arguments>
- <variable>_delay</variable>
- <swiftscript:filename>
- <variable>i</variable>
- </swiftscript:filename>
- </vdl:arguments>
- <vdl:stdout>
- <swiftscript:filename>
- <variable>o</variable>
- </swiftscript:filename>
- </vdl:stdout>
- </vdl:execute>
- <vdl:closedataset var="{o}"/>
- <log level="debug" message="PROCEDURE_END line=4"/></element>
-
- <set name="delay">
- <vdl:new type="string" dbgname="delay" waitfor="88000" />
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>delay</string>
- <vdl:getdatasetprovenanceid var="{delay}" />
- <string>{#thread}</string>
- </parameterlog>
- <set name="swift#mapper#17002">
- <vdl:new type="string[]" dbgname="swift#mapper#17002" waitfor="" />
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>swift#mapper#17002</string>
- <vdl:getdatasetprovenanceid var="{swift#mapper#17002}" />
- <string>{#thread}</string>
- </parameterlog>
- <set name="out">
- <vdl:new type="file[]" dbgname="out" waitfor="88002">
- <vdl:mapping descriptor="array_mapper">
- <vdl:parameter name="files"><variable>swift#mapper#17002</variable></vdl:parameter>
- </vdl:mapping>
- </vdl:new>
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>out</string>
- <vdl:getdatasetprovenanceid var="{out}" />
- <string>{#thread}</string>
- </parameterlog>
- <set name="swift#mapper#17007">
- <vdl:new type="string[]" dbgname="swift#mapper#17007" waitfor="" />
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>swift#mapper#17007</string>
- <vdl:getdatasetprovenanceid var="{swift#mapper#17007}" />
- <string>{#thread}</string>
- </parameterlog>
- <set name="data">
- <vdl:new type="file[]" dbgname="data">
- <vdl:mapping descriptor="array_mapper">
- <vdl:parameter name="files"><variable>swift#mapper#17007</variable></vdl:parameter>
- <vdl:parameter name="input" value="true" />
- </vdl:mapping>
- </vdl:new>
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>data</string>
- <vdl:getdatasetprovenanceid var="{data}" />
- <string>{#thread}</string>
- </parameterlog>
- <restartLog>
- <vdl:mains>
- <vdl:startprogressticker />
- <vdl:mainp>
- <parallel>
- <sequential>
- <vdl:setfieldvalue>
- <argument name="var">
- <variable>delay</variable>
- </argument>
- <argument name="value">
- <swiftscript:arg>
- <variable>swift#string#17000</variable><variable>swift#string#17001</variable>
- </swiftscript:arg>
- </argument>
- </vdl:setfieldvalue>
- <partialCloseDataset var="{delay}" closeID="88000" />
- </sequential>
- <sequential>
- <vdl:setfieldvalue>
- <argument name="var">
- <variable>swift#mapper#17002</variable>
- </argument>
- <argument name="value">
- <vdl:createarray>
- <list>
- <variable>swift#string#17003</variable>
- <variable>swift#string#17004</variable>
- <variable>swift#string#17005</variable>
- <variable>swift#string#17006</variable>
- </list>
- </vdl:createarray>
- </argument>
- </vdl:setfieldvalue>
- </sequential>
- <sequential>
- <vdl:setfieldvalue>
- <argument name="var">
- <variable>swift#mapper#17007</variable>
- </argument>
- <argument name="value">
- <vdl:createarray>
- <list>
- <variable>swift#string#17008</variable>
- <variable>swift#string#17009</variable>
- <variable>swift#string#17010</variable>
- <variable>swift#string#17010</variable>
- </list>
- </vdl:createarray>
- </argument>
- </vdl:setfieldvalue>
- </sequential>
- <sequential>
- <vdl:tparallelFor name="$" selfClose="true">
- <getarrayiterator><variable>out</variable></getarrayiterator>
- <set names="$$, o">
- <each items="{$}"/>
- </set>
- <set name="j">
- <vdl:new type="int" value="{$$}"/>
- </set> <log level="debug" message="FOREACH_IT_START line=15 thread={#thread}"/>
- <log level="debug"><string>SCOPE thread={#thread}</string></log>
-
- <sequentialWithID>
- <sequential>
- <catnap>
- <parallel>
- <vdl:getfieldsubscript>
- <argument name="var"><variable>out</variable></argument>
- <argument name="subscript"><variable>j</variable></argument>
- </vdl:getfieldsubscript>
- <variable>delay</variable>
- <vdl:getfieldsubscript>
- <argument name="var"><variable>data</variable></argument>
- <argument name="subscript"><variable>j</variable></argument>
- </vdl:getfieldsubscript>
- </parallel>
- </catnap>
- </sequential>
- </sequentialWithID>
- <log level="debug" message="FOREACH_IT_END line=15 thread={#thread}"/>
- </vdl:tparallelFor>
- <partialCloseDataset var="{out}" closeID="88002" />
- </sequential>
- </parallel>
- </vdl:mainp>
- <vdl:stopprogressticker />
- </vdl:mains>
- </restartLog>
-</project>
Copied: branches/release-0.93.1/tests/cdm/absolute/rr.kml (from rev 5504, branches/release-0.93/tests/cdm/absolute/rr.kml)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/rr.kml (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/rr.kml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,223 @@
+<project><!-- CACHE ID 4ce39a0c-5c18-4b47-8d49-6688cfc1844b -->
+ <import file="sys.xml"/>
+ <import file="scheduler.xml"/>
+ <import file="rlog.xml"/>
+ <import file="vdl.k"/>
+ <types>
+ <xs:schema targetNamespace="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:simpleType name="file">
+ <xs:restriction base="string"/>
+ </xs:simpleType>
+ </xs:schema>
+ </types>
+ <global name="swift#string#17008">
+ <vdl:new type="string" value="./indir/data1.txt" />
+ </global>
+ <global name="swift#string#17001">
+ <vdl:new type="string" value="1" />
+ </global>
+ <global name="swift#string#17000">
+ <vdl:new type="string" value="s" />
+ </global>
+ <global name="swift#string#17010">
+ <vdl:new type="string" value="./indir/data4.txt" />
+ </global>
+ <global name="swift#string#17006">
+ <vdl:new type="string" value="./outdir/out4.data" />
+ </global>
+ <global name="swift#string#17009">
+ <vdl:new type="string" value="./indir/data2.txt" />
+ </global>
+ <global name="swift#string#17005">
+ <vdl:new type="string" value="./outdir/out3.data" />
+ </global>
+ <global name="swift#string#17004">
+ <vdl:new type="string" value="./outdir/out2.data" />
+ </global>
+ <global name="swift#string#17003">
+ <vdl:new type="string" value="./outdir/out1.data" />
+ </global>
+ <element name="catnap" arguments="o,_delay,i">
+ <parameterlog>
+ <string>input</string>
+ <string>_delay</string>
+ <vdl:getdatasetprovenanceid var="{_delay}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <parameterlog>
+ <string>input</string>
+ <string>i</string>
+ <vdl:getdatasetprovenanceid var="{i}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <parameterlog>
+ <string>output</string>
+ <string>o</string>
+ <vdl:getdatasetprovenanceid var="{o}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <log level="debug" message="PROCEDURE line=4 thread={#thread} name=catnap"/>
+ <vdl:execute>
+ <vdl:tr>catnap</vdl:tr>
+ <vdl:stagein var="{_delay}"/>
+ <vdl:stagein var="{i}"/>
+ <vdl:stageout var="{o}"/>
+ <vdl:arguments>
+ <variable>_delay</variable>
+ <swiftscript:filename>
+ <variable>i</variable>
+ </swiftscript:filename>
+ </vdl:arguments>
+ <vdl:stdout>
+ <swiftscript:filename>
+ <variable>o</variable>
+ </swiftscript:filename>
+ </vdl:stdout>
+ </vdl:execute>
+ <vdl:closedataset var="{o}"/>
+ <log level="debug" message="PROCEDURE_END line=4"/></element>
+
+ <set name="delay">
+ <vdl:new type="string" dbgname="delay" waitfor="88000" />
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>delay</string>
+ <vdl:getdatasetprovenanceid var="{delay}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <set name="swift#mapper#17002">
+ <vdl:new type="string[]" dbgname="swift#mapper#17002" waitfor="" />
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>swift#mapper#17002</string>
+ <vdl:getdatasetprovenanceid var="{swift#mapper#17002}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <set name="out">
+ <vdl:new type="file[]" dbgname="out" waitfor="88002">
+ <vdl:mapping descriptor="array_mapper">
+ <vdl:parameter name="files"><variable>swift#mapper#17002</variable></vdl:parameter>
+ </vdl:mapping>
+ </vdl:new>
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>out</string>
+ <vdl:getdatasetprovenanceid var="{out}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <set name="swift#mapper#17007">
+ <vdl:new type="string[]" dbgname="swift#mapper#17007" waitfor="" />
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>swift#mapper#17007</string>
+ <vdl:getdatasetprovenanceid var="{swift#mapper#17007}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <set name="data">
+ <vdl:new type="file[]" dbgname="data">
+ <vdl:mapping descriptor="array_mapper">
+ <vdl:parameter name="files"><variable>swift#mapper#17007</variable></vdl:parameter>
+ <vdl:parameter name="input" value="true" />
+ </vdl:mapping>
+ </vdl:new>
+ </set>
+ <parameterlog>
+ <string>intermediate</string>
+ <string>data</string>
+ <vdl:getdatasetprovenanceid var="{data}" />
+ <string>{#thread}</string>
+ </parameterlog>
+ <restartLog>
+ <vdl:mains>
+ <vdl:startprogressticker />
+ <vdl:mainp>
+ <parallel>
+ <sequential>
+ <vdl:setfieldvalue>
+ <argument name="var">
+ <variable>delay</variable>
+ </argument>
+ <argument name="value">
+ <swiftscript:arg>
+ <variable>swift#string#17000</variable><variable>swift#string#17001</variable>
+ </swiftscript:arg>
+ </argument>
+ </vdl:setfieldvalue>
+ <partialCloseDataset var="{delay}" closeID="88000" />
+ </sequential>
+ <sequential>
+ <vdl:setfieldvalue>
+ <argument name="var">
+ <variable>swift#mapper#17002</variable>
+ </argument>
+ <argument name="value">
+ <vdl:createarray>
+ <list>
+ <variable>swift#string#17003</variable>
+ <variable>swift#string#17004</variable>
+ <variable>swift#string#17005</variable>
+ <variable>swift#string#17006</variable>
+ </list>
+ </vdl:createarray>
+ </argument>
+ </vdl:setfieldvalue>
+ </sequential>
+ <sequential>
+ <vdl:setfieldvalue>
+ <argument name="var">
+ <variable>swift#mapper#17007</variable>
+ </argument>
+ <argument name="value">
+ <vdl:createarray>
+ <list>
+ <variable>swift#string#17008</variable>
+ <variable>swift#string#17009</variable>
+ <variable>swift#string#17010</variable>
+ <variable>swift#string#17010</variable>
+ </list>
+ </vdl:createarray>
+ </argument>
+ </vdl:setfieldvalue>
+ </sequential>
+ <sequential>
+ <vdl:tparallelFor name="$" selfClose="true">
+ <getarrayiterator><variable>out</variable></getarrayiterator>
+ <set names="$$, o">
+ <each items="{$}"/>
+ </set>
+ <set name="j">
+ <vdl:new type="int" value="{$$}"/>
+ </set> <log level="debug" message="FOREACH_IT_START line=15 thread={#thread}"/>
+ <log level="debug"><string>SCOPE thread={#thread}</string></log>
+
+ <sequentialWithID>
+ <sequential>
+ <catnap>
+ <parallel>
+ <vdl:getfieldsubscript>
+ <argument name="var"><variable>out</variable></argument>
+ <argument name="subscript"><variable>j</variable></argument>
+ </vdl:getfieldsubscript>
+ <variable>delay</variable>
+ <vdl:getfieldsubscript>
+ <argument name="var"><variable>data</variable></argument>
+ <argument name="subscript"><variable>j</variable></argument>
+ </vdl:getfieldsubscript>
+ </parallel>
+ </catnap>
+ </sequential>
+ </sequentialWithID>
+ <log level="debug" message="FOREACH_IT_END line=15 thread={#thread}"/>
+ </vdl:tparallelFor>
+ <partialCloseDataset var="{out}" closeID="88002" />
+ </sequential>
+ </parallel>
+ </vdl:mainp>
+ <vdl:stopprogressticker />
+ </vdl:mains>
+ </restartLog>
+</project>
Deleted: branches/release-0.93.1/tests/cdm/absolute/rr.swift
===================================================================
--- branches/release-0.93/tests/cdm/absolute/rr.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/rr.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,18 +0,0 @@
-
-type file;
-
-app (file o) catnap (string _delay, file i)
-{
- catnap _delay @i stdout=@o;
-}
-
-string delay=@arg("s","1");
-
-file out[]<array_mapper; files=["./outdir/out1.data","./outdir/out2.data","./outdir/out3.data","./outdir/out4.data"]>;
-
-file data[]<array_mapper; files=["./indir/data1.txt","./indir/data2.txt","./indir/data4.txt","./indir/data4.txt"]>;
-
-foreach o, j in out {
- out[j] = catnap(delay,data[j]);
-}
-
Copied: branches/release-0.93.1/tests/cdm/absolute/rr.swift (from rev 5504, branches/release-0.93/tests/cdm/absolute/rr.swift)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/rr.swift (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/rr.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,18 @@
+
+type file;
+
+app (file o) catnap (string _delay, file i)
+{
+ catnap _delay @i stdout=@o;
+}
+
+string delay=@arg("s","1");
+
+file out[]<array_mapper; files=["./outdir/out1.data","./outdir/out2.data","./outdir/out3.data","./outdir/out4.data"]>;
+
+file data[]<array_mapper; files=["./indir/data1.txt","./indir/data2.txt","./indir/data4.txt","./indir/data4.txt"]>;
+
+foreach o, j in out {
+ out[j] = catnap(delay,data[j]);
+}
+
Deleted: branches/release-0.93.1/tests/cdm/absolute/run.sh
===================================================================
--- branches/release-0.93/tests/cdm/absolute/run.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/run.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,16 +0,0 @@
-swift -config cf.absolute -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid ff_config_abs ff.swift
-
-swift -config cf.absolute -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid fr_config_abs fr.swift
-
-swift -config cf.absolute -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid rf_config_abs rf.swift
-
-swift -config cf.absolute -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid rr_config_abs rr.swift
-
-swift -config cf.relative -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid ff_config_rel ff.swift
-
-swift -config cf.relative -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid fr_config_rel fr.swift
-
-swift -config cf.relative -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid rf_config_rel rf.swift
-
-swift -config cf.relative -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid rr_config_rel rr.swift
-
Copied: branches/release-0.93.1/tests/cdm/absolute/run.sh (from rev 5504, branches/release-0.93/tests/cdm/absolute/run.sh)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/run.sh (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/run.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,16 @@
+swift -config cf.absolute -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid ff_config_abs ff.swift
+
+swift -config cf.absolute -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid fr_config_abs fr.swift
+
+swift -config cf.absolute -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid rf_config_abs rf.swift
+
+swift -config cf.absolute -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid rr_config_abs rr.swift
+
+swift -config cf.relative -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid ff_config_rel ff.swift
+
+swift -config cf.relative -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid fr_config_rel fr.swift
+
+swift -config cf.relative -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid rf_config_rel rf.swift
+
+swift -config cf.relative -sites.file sites.xml -tc.file tc -cdm.file fs.data -runid rr_config_rel rr.swift
+
Deleted: branches/release-0.93.1/tests/cdm/absolute/set-env.sh
===================================================================
--- branches/release-0.93/tests/cdm/absolute/set-env.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/set-env.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-export PATH=/home/ketan/swift-install/trunk/cog/modules/swift/bin/grid:/home/ketan/swift-install/0.93/cog/modules/swift/dist/swift-svn/bin:$PATH
Copied: branches/release-0.93.1/tests/cdm/absolute/set-env.sh (from rev 5504, branches/release-0.93/tests/cdm/absolute/set-env.sh)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/set-env.sh (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/set-env.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+export PATH=/home/ketan/swift-install/trunk/cog/modules/swift/bin/grid:/home/ketan/swift-install/0.93/cog/modules/swift/dist/swift-svn/bin:$PATH
Deleted: branches/release-0.93.1/tests/cdm/absolute/setup.sh
===================================================================
--- branches/release-0.93/tests/cdm/absolute/setup.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-rm -rfv /tmp/outdir
-cp -r -v indir/ /tmp/
-
-exit 0
Copied: branches/release-0.93.1/tests/cdm/absolute/setup.sh (from rev 5504, branches/release-0.93/tests/cdm/absolute/setup.sh)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/setup.sh (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+rm -rfv /tmp/outdir
+cp -r -v indir/ /tmp/
+
+exit 0
Deleted: branches/release-0.93.1/tests/cdm/absolute/sites.xml
===================================================================
--- branches/release-0.93/tests/cdm/absolute/sites.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/sites.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-<config>
- <pool handle="localhost" sysinfo="INTEL32::LINUX">
- <gridftp url="local://localhost" />
- <execution provider="local" url="none" />
- <workdirectory>work/</workdirectory>
- </pool>
-</config>
Copied: branches/release-0.93.1/tests/cdm/absolute/sites.xml (from rev 5504, branches/release-0.93/tests/cdm/absolute/sites.xml)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/sites.xml (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/sites.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+<config>
+ <pool handle="localhost" sysinfo="INTEL32::LINUX">
+ <gridftp url="local://localhost" />
+ <execution provider="local" url="none" />
+ <workdirectory>work/</workdirectory>
+ </pool>
+</config>
Deleted: branches/release-0.93.1/tests/cdm/absolute/tc
===================================================================
--- branches/release-0.93/tests/cdm/absolute/tc 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/cdm/absolute/tc 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,3 +0,0 @@
-localhost sh /bin/sh null null null
-localhost catnap /home/ketan/cdm_tests/catnap.sh null null GLOBUS::maxwalltime="00:01:00"
-
Copied: branches/release-0.93.1/tests/cdm/absolute/tc (from rev 5504, branches/release-0.93/tests/cdm/absolute/tc)
===================================================================
--- branches/release-0.93.1/tests/cdm/absolute/tc (rev 0)
+++ branches/release-0.93.1/tests/cdm/absolute/tc 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,3 @@
+localhost sh /bin/sh null null null
+localhost catnap /home/ketan/cdm_tests/catnap.sh null null GLOBUS::maxwalltime="00:01:00"
+
Copied: branches/release-0.93.1/tests/functions/501-filenames.check.sh (from rev 5504, branches/release-0.93/tests/functions/501-filenames.check.sh)
===================================================================
--- branches/release-0.93.1/tests/functions/501-filenames.check.sh (rev 0)
+++ branches/release-0.93.1/tests/functions/501-filenames.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+sum1=`sum 501-filenames.out`
+sum2=`sum 501-filenames.out.expected`
+
+if [ "$sum1" != "$sum2" ]; then
+ echo Error: Created file does not match expected output
+ exit 1
+fi
+
+exit 0
Copied: branches/release-0.93.1/tests/functions/501-filenames.out.expected (from rev 5504, branches/release-0.93/tests/functions/501-filenames.out.expected)
===================================================================
--- branches/release-0.93.1/tests/functions/501-filenames.out.expected (rev 0)
+++ branches/release-0.93.1/tests/functions/501-filenames.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+a.txt b.txt c.txt
Copied: branches/release-0.93.1/tests/functions/501-filenames.setup.sh (from rev 5504, branches/release-0.93/tests/functions/501-filenames.setup.sh)
===================================================================
--- branches/release-0.93.1/tests/functions/501-filenames.setup.sh (rev 0)
+++ branches/release-0.93.1/tests/functions/501-filenames.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cp $GROUP/501-filenames.out.expected .
+echo blah > a.txt
+echo blah > b.txt
+echo blah > c.txt
Copied: branches/release-0.93.1/tests/functions/501-filenames.swift (from rev 5504, branches/release-0.93/tests/functions/501-filenames.swift)
===================================================================
--- branches/release-0.93.1/tests/functions/501-filenames.swift (rev 0)
+++ branches/release-0.93.1/tests/functions/501-filenames.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,11 @@
+type file;
+
+app (file o) echo ( file files[] )
+{
+ echo @filenames(files) stdout=@o;
+}
+
+string s[] = [ "a.txt", "b.txt", "c.txt" ];
+file f[] <array_mapper;files=s>;
+file output<"501-filenames.out">;
+output = echo(f);
Property changes on: branches/release-0.93.1/tests/groups
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/tests/groups:4761-5134
+ /branches/release-0.93/tests/groups:5279-5504
/trunk/tests/groups:4761-5134
Property changes on: branches/release-0.93.1/tests/sites
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/release-0.93/tests/sites:5279-5504
/trunk/tests/providers:4761-5115
/trunk/tests/sites:4762-4946
Deleted: branches/release-0.93.1/tests/sites/PADS/coasters/README
===================================================================
--- branches/release-0.93/tests/sites/PADS/coasters/README 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/README 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,2 +0,0 @@
-Provider test for PADS with coasters and pbs
-Make sure you have your default project set up (run 'projects' or 'projects -h' for more info)
Copied: branches/release-0.93.1/tests/sites/PADS/coasters/README (from rev 5504, branches/release-0.93/tests/sites/PADS/coasters/README)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/coasters/README (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/README 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,2 @@
+Provider test for PADS with coasters and pbs
+Make sure you have your default project set up (run 'projects' or 'projects -h' for more info)
Deleted: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0001.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/coasters/catsn.0001.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0001.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/coasters/catsn.0001.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0001.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0002.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/coasters/catsn.0002.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0002.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/coasters/catsn.0002.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0002.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0003.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/coasters/catsn.0003.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0003.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/coasters/catsn.0003.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0003.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0004.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/coasters/catsn.0004.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0004.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/coasters/catsn.0004.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0004.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0005.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/coasters/catsn.0005.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0005.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/coasters/catsn.0005.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0005.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0006.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/coasters/catsn.0006.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0006.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/coasters/catsn.0006.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0006.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0007.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/coasters/catsn.0007.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0007.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/coasters/catsn.0007.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0007.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0008.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/coasters/catsn.0008.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0008.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/coasters/catsn.0008.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0008.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0009.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/coasters/catsn.0009.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0009.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/coasters/catsn.0009.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0009.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0010.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/coasters/catsn.0010.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0010.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/coasters/catsn.0010.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0010.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.setup.sh
===================================================================
--- branches/release-0.93/tests/sites/PADS/coasters/catsn.setup.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-cp -v $GROUP/data.txt . || exit 1
Copied: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.setup.sh (from rev 5504, branches/release-0.93/tests/sites/PADS/coasters/catsn.setup.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/coasters/catsn.setup.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cp -v $GROUP/data.txt . || exit 1
Deleted: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.swift
===================================================================
--- branches/release-0.93/tests/sites/PADS/coasters/catsn.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,15 +0,0 @@
-type file;
-
-app (file o) cat (file i)
-{
- cat @i stdout=@o;
-}
-
-string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-string char[] = @strsplit(t, "");
-
-file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
-foreach j in [1:@toint(@arg("n","10"))] {
- file data<"data.txt">;
- out[j] = cat(data);
-}
Copied: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.swift (from rev 5504, branches/release-0.93/tests/sites/PADS/coasters/catsn.swift)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/coasters/catsn.swift (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,15 @@
+type file;
+
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
+
+string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+string char[] = @strsplit(t, "");
+
+file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
+foreach j in [1:@toint(@arg("n","10"))] {
+ file data<"data.txt">;
+ out[j] = cat(data);
+}
Deleted: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.timeout
===================================================================
--- branches/release-0.93/tests/sites/PADS/coasters/catsn.timeout 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,2 +0,0 @@
-7200
-
Copied: branches/release-0.93.1/tests/sites/PADS/coasters/catsn.timeout (from rev 5504, branches/release-0.93/tests/sites/PADS/coasters/catsn.timeout)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/coasters/catsn.timeout (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/catsn.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,2 @@
+7200
+
Deleted: branches/release-0.93.1/tests/sites/PADS/coasters/data.txt
===================================================================
--- branches/release-0.93/tests/sites/PADS/coasters/data.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/coasters/data.txt (from rev 5504, branches/release-0.93/tests/sites/PADS/coasters/data.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/coasters/data.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/coasters/sites.template.xml
===================================================================
--- branches/release-0.93/tests/sites/PADS/coasters/sites.template.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,16 +0,0 @@
-<config>
-<pool handle="PADS-coasters">
- <execution jobmanager="local:pbs" provider="coaster" url="none"/>
- <filesystem provider="local" url="none" />
- <profile namespace="globus" key="maxWallTime">2</profile>
- <profile namespace="globus" key="maxTime">300</profile>
- <profile key="jobsPerNode" namespace="globus">1</profile>
- <profile key="slots" namespace="globus">1</profile>
- <profile key="nodeGranularity" namespace="globus">1</profile>
- <profile key="maxNodes" namespace="globus">1</profile>
- <profile key="queue" namespace="globus">fast</profile>
- <profile key="jobThrottle" namespace="karajan">5.99</profile>
- <profile key="initialScore" namespace="karajan">10000</profile>
- <workdirectory>_WORK_</workdirectory>
-</pool>
-</config>
Copied: branches/release-0.93.1/tests/sites/PADS/coasters/sites.template.xml (from rev 5504, branches/release-0.93/tests/sites/PADS/coasters/sites.template.xml)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/coasters/sites.template.xml (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,16 @@
+<config>
+<pool handle="PADS-coasters">
+ <execution jobmanager="local:pbs" provider="coaster" url="none"/>
+ <filesystem provider="local" url="none" />
+ <profile namespace="globus" key="maxWallTime">2</profile>
+ <profile namespace="globus" key="maxTime">300</profile>
+ <profile key="jobsPerNode" namespace="globus">1</profile>
+ <profile key="slots" namespace="globus">1</profile>
+ <profile key="nodeGranularity" namespace="globus">1</profile>
+ <profile key="maxNodes" namespace="globus">1</profile>
+ <profile key="queue" namespace="globus">fast</profile>
+ <profile key="jobThrottle" namespace="karajan">5.99</profile>
+ <profile key="initialScore" namespace="karajan">10000</profile>
+ <workdirectory>_WORK_</workdirectory>
+</pool>
+</config>
Deleted: branches/release-0.93.1/tests/sites/PADS/coasters/tc.template.data
===================================================================
--- branches/release-0.93/tests/sites/PADS/coasters/tc.template.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-PADS-coasters echo /bin/echo INSTALLED INTEL32::LINUX null
-PADS-coasters cat /bin/cat INSTALLED INTEL32::LINUX null
-PADS-coasters ls /bin/ls INSTALLED INTEL32::LINUX null
-PADS-coasters grep /bin/grep INSTALLED INTEL32::LINUX null
-PADS-coasters sort /bin/sort INSTALLED INTEL32::LINUX null
-PADS-coasters paste /bin/paste INSTALLED INTEL32::LINUX null
-PADS-coasters wc /usr/bin/wc INSTALLED INTEL32::LINUX null
Copied: branches/release-0.93.1/tests/sites/PADS/coasters/tc.template.data (from rev 5504, branches/release-0.93/tests/sites/PADS/coasters/tc.template.data)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/coasters/tc.template.data (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/coasters/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+PADS-coasters echo /bin/echo INSTALLED INTEL32::LINUX null
+PADS-coasters cat /bin/cat INSTALLED INTEL32::LINUX null
+PADS-coasters ls /bin/ls INSTALLED INTEL32::LINUX null
+PADS-coasters grep /bin/grep INSTALLED INTEL32::LINUX null
+PADS-coasters sort /bin/sort INSTALLED INTEL32::LINUX null
+PADS-coasters paste /bin/paste INSTALLED INTEL32::LINUX null
+PADS-coasters wc /usr/bin/wc INSTALLED INTEL32::LINUX null
Deleted: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0001.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/pbs/catsn.0001.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0001.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/pbs/catsn.0001.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0001.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0002.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/pbs/catsn.0002.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0002.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/pbs/catsn.0002.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0002.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0003.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/pbs/catsn.0003.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0003.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/pbs/catsn.0003.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0003.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0004.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/pbs/catsn.0004.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0004.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/pbs/catsn.0004.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0004.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0005.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/pbs/catsn.0005.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0005.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/pbs/catsn.0005.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0005.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0006.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/pbs/catsn.0006.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0006.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/pbs/catsn.0006.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0006.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0007.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/pbs/catsn.0007.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0007.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/pbs/catsn.0007.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0007.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0008.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/pbs/catsn.0008.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0008.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/pbs/catsn.0008.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0008.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0009.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/pbs/catsn.0009.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0009.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/pbs/catsn.0009.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0009.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0010.out.expected
===================================================================
--- branches/release-0.93/tests/sites/PADS/pbs/catsn.0010.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0010.out.expected (from rev 5504, branches/release-0.93/tests/sites/PADS/pbs/catsn.0010.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0010.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.setup.sh
===================================================================
--- branches/release-0.93/tests/sites/PADS/pbs/catsn.setup.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-cp -v $GROUP/data.txt . || exit 1
Copied: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.setup.sh (from rev 5504, branches/release-0.93/tests/sites/PADS/pbs/catsn.setup.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/pbs/catsn.setup.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cp -v $GROUP/data.txt . || exit 1
Deleted: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.swift
===================================================================
--- branches/release-0.93/tests/sites/PADS/pbs/catsn.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,15 +0,0 @@
-type file;
-
-app (file o) cat (file i)
-{
- cat @i stdout=@o;
-}
-
-string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-string char[] = @strsplit(t, "");
-
-file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
-foreach j in [1:@toint(@arg("n","10"))] {
- file data<"data.txt">;
- out[j] = cat(data);
-}
Copied: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.swift (from rev 5504, branches/release-0.93/tests/sites/PADS/pbs/catsn.swift)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/pbs/catsn.swift (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,15 @@
+type file;
+
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
+
+string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+string char[] = @strsplit(t, "");
+
+file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
+foreach j in [1:@toint(@arg("n","10"))] {
+ file data<"data.txt">;
+ out[j] = cat(data);
+}
Deleted: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.timeout
===================================================================
--- branches/release-0.93/tests/sites/PADS/pbs/catsn.timeout 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,2 +0,0 @@
-7200
-
Copied: branches/release-0.93.1/tests/sites/PADS/pbs/catsn.timeout (from rev 5504, branches/release-0.93/tests/sites/PADS/pbs/catsn.timeout)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/pbs/catsn.timeout (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/catsn.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,2 @@
+7200
+
Deleted: branches/release-0.93.1/tests/sites/PADS/pbs/data.txt
===================================================================
--- branches/release-0.93/tests/sites/PADS/pbs/data.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/PADS/pbs/data.txt (from rev 5504, branches/release-0.93/tests/sites/PADS/pbs/data.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/pbs/data.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/PADS/pbs/sites.template.xml
===================================================================
--- branches/release-0.93/tests/sites/PADS/pbs/sites.template.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,16 +0,0 @@
-<config>
-<pool handle="PADS-pbs">
- <execution jobmanager="local:pbs" provider="pbs" url="none"/>
- <filesystem provider="local" url="none" />
- <profile namespace="globus" key="maxWallTime">2</profile>
- <profile namespace="globus" key="maxTime">300</profile>
- <profile key="jobsPerNode" namespace="globus">1</profile>
- <profile key="slots" namespace="globus">1</profile>
- <profile key="nodeGranularity" namespace="globus">1</profile>
- <profile key="maxNodes" namespace="globus">1</profile>
- <profile key="queue" namespace="globus">fast</profile>
- <profile key="jobThrottle" namespace="karajan">5.99</profile>
- <profile key="initialScore" namespace="karajan">10000</profile>
- <workdirectory>_WORK_</workdirectory>
-</pool>
-</config>
Copied: branches/release-0.93.1/tests/sites/PADS/pbs/sites.template.xml (from rev 5504, branches/release-0.93/tests/sites/PADS/pbs/sites.template.xml)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/pbs/sites.template.xml (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,16 @@
+<config>
+<pool handle="PADS-pbs">
+ <execution jobmanager="local:pbs" provider="pbs" url="none"/>
+ <filesystem provider="local" url="none" />
+ <profile namespace="globus" key="maxWallTime">2</profile>
+ <profile namespace="globus" key="maxTime">300</profile>
+ <profile key="jobsPerNode" namespace="globus">1</profile>
+ <profile key="slots" namespace="globus">1</profile>
+ <profile key="nodeGranularity" namespace="globus">1</profile>
+ <profile key="maxNodes" namespace="globus">1</profile>
+ <profile key="queue" namespace="globus">fast</profile>
+ <profile key="jobThrottle" namespace="karajan">5.99</profile>
+ <profile key="initialScore" namespace="karajan">10000</profile>
+ <workdirectory>_WORK_</workdirectory>
+</pool>
+</config>
Deleted: branches/release-0.93.1/tests/sites/PADS/pbs/tc.template.data
===================================================================
--- branches/release-0.93/tests/sites/PADS/pbs/tc.template.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-PADS-pbs echo /bin/echo INSTALLED INTEL32::LINUX null
-PADS-pbs cat /bin/cat INSTALLED INTEL32::LINUX null
-PADS-pbs ls /bin/ls INSTALLED INTEL32::LINUX null
-PADS-pbs grep /bin/grep INSTALLED INTEL32::LINUX null
-PADS-pbs sort /bin/sort INSTALLED INTEL32::LINUX null
-PADS-pbs paste /bin/paste INSTALLED INTEL32::LINUX null
-PADS-pbs wc /usr/bin/wc INSTALLED INTEL32::LINUX null
Copied: branches/release-0.93.1/tests/sites/PADS/pbs/tc.template.data (from rev 5504, branches/release-0.93/tests/sites/PADS/pbs/tc.template.data)
===================================================================
--- branches/release-0.93.1/tests/sites/PADS/pbs/tc.template.data (rev 0)
+++ branches/release-0.93.1/tests/sites/PADS/pbs/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+PADS-pbs echo /bin/echo INSTALLED INTEL32::LINUX null
+PADS-pbs cat /bin/cat INSTALLED INTEL32::LINUX null
+PADS-pbs ls /bin/ls INSTALLED INTEL32::LINUX null
+PADS-pbs grep /bin/grep INSTALLED INTEL32::LINUX null
+PADS-pbs sort /bin/sort INSTALLED INTEL32::LINUX null
+PADS-pbs paste /bin/paste INSTALLED INTEL32::LINUX null
+PADS-pbs wc /usr/bin/wc INSTALLED INTEL32::LINUX null
Deleted: branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.check.sh
===================================================================
--- branches/release-0.93/tests/sites/beagle/coasters/001-catsn.check.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Pseudo-code for now
-
-# for f in *.out.expected
-# do
-# assert *.out exists
-# assert *.out == data.txt
-# done
Copied: branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.check.sh (from rev 5504, branches/release-0.93/tests/sites/beagle/coasters/001-catsn.check.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.check.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Pseudo-code for now
+
+# for f in *.out.expected
+# do
+# assert *.out exists
+# assert *.out == data.txt
+# done
Deleted: branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.setup.sh
===================================================================
--- branches/release-0.93/tests/sites/beagle/coasters/001-catsn.setup.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-cp -v $GROUP/data.txt . || exit 1
Copied: branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.setup.sh (from rev 5504, branches/release-0.93/tests/sites/beagle/coasters/001-catsn.setup.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.setup.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cp -v $GROUP/data.txt . || exit 1
Deleted: branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.swift
===================================================================
--- branches/release-0.93/tests/sites/beagle/coasters/001-catsn.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,15 +0,0 @@
-type file;
-
-app (file o) cat (file i)
-{
- cat @i stdout=@o;
-}
-
-// string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-// string char[] = @strsplit(t, "");
-
-file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
-foreach j in [1:@toint(@arg("n","10"))] {
- file data<"data.txt">;
- out[j] = cat(data);
-}
Copied: branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.swift (from rev 5504, branches/release-0.93/tests/sites/beagle/coasters/001-catsn.swift)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.swift (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,15 @@
+type file;
+
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
+
+// string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+// string char[] = @strsplit(t, "");
+
+file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
+foreach j in [1:@toint(@arg("n","10"))] {
+ file data<"data.txt">;
+ out[j] = cat(data);
+}
Deleted: branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.timeout
===================================================================
--- branches/release-0.93/tests/sites/beagle/coasters/001-catsn.timeout 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-180
Copied: branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.timeout (from rev 5504, branches/release-0.93/tests/sites/beagle/coasters/001-catsn.timeout)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.timeout (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/coasters/001-catsn.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+180
Deleted: branches/release-0.93.1/tests/sites/beagle/coasters/data.txt
===================================================================
--- branches/release-0.93/tests/sites/beagle/coasters/data.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/coasters/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-HELLO
Copied: branches/release-0.93.1/tests/sites/beagle/coasters/data.txt (from rev 5504, branches/release-0.93/tests/sites/beagle/coasters/data.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/coasters/data.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/coasters/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+HELLO
Deleted: branches/release-0.93.1/tests/sites/beagle/coasters/sites.template.xml
===================================================================
--- branches/release-0.93/tests/sites/beagle/coasters/sites.template.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/coasters/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,33 +0,0 @@
-<config>
-
-<import file="sys.xml"/>
-<set name="wdir" value="/lustre/beagle/{user.name}/work"/>
-<echo message="setting workDirectory to: {wdir}"/>
-
-<pool handle="beagle-pbs">
- <execution jobmanager="local:pbs" provider="coaster" url="none"/>
- <filesystem provider="local" url="none" />
- <profile namespace="globus" key="maxWallTime">1</profile>
- <profile namespace="globus" key="maxTime">7200</profile>
-
- <profile namespace="globus" key="providerAttributes">
- pbs.aprun;pbs.mpp;depth=24
- </profile>
- <profile key="jobsPerNode" namespace="globus">24</profile>
- <profile key="slots" namespace="globus">1</profile>
- <profile key="nodeGranularity" namespace="globus">1</profile>
- <profile key="maxNodes" namespace="globus">1</profile>
- <profile key="queue" namespace="globus">batch</profile>
- <profile key="workerLoggingLevel" namespace="globus">DEBUG</profile>
- <profile key="workerLoggingDirectory" namespace="globus">{wdir}</profile>
- <profile key="jobThrottle" namespace="karajan">5.99</profile>
- <profile key="initialScore" namespace="karajan">10000</profile>
- <profile namespace="globus" key="project">_PROJECT_</profile>
- <profile namespace="globus" key="project">_QUEUE_</profile>
- <workdirectory>{wdir}</workdirectory>
-</pool>
-</config>
-
-<!-- RESERVATIONS:
-Add something like this to your providerAttributes:
-pbs.resources=advres=modFTDock.47 -->
Copied: branches/release-0.93.1/tests/sites/beagle/coasters/sites.template.xml (from rev 5504, branches/release-0.93/tests/sites/beagle/coasters/sites.template.xml)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/coasters/sites.template.xml (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/coasters/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,33 @@
+<config>
+
+<import file="sys.xml"/>
+<set name="wdir" value="/lustre/beagle/{user.name}/work"/>
+<echo message="setting workDirectory to: {wdir}"/>
+
+<pool handle="beagle-pbs">
+ <execution jobmanager="local:pbs" provider="coaster" url="none"/>
+ <filesystem provider="local" url="none" />
+ <profile namespace="globus" key="maxWallTime">1</profile>
+ <profile namespace="globus" key="maxTime">7200</profile>
+
+ <profile namespace="globus" key="providerAttributes">
+ pbs.aprun;pbs.mpp;depth=24
+ </profile>
+ <profile key="jobsPerNode" namespace="globus">24</profile>
+ <profile key="slots" namespace="globus">1</profile>
+ <profile key="nodeGranularity" namespace="globus">1</profile>
+ <profile key="maxNodes" namespace="globus">1</profile>
+ <profile key="queue" namespace="globus">batch</profile>
+ <profile key="workerLoggingLevel" namespace="globus">DEBUG</profile>
+ <profile key="workerLoggingDirectory" namespace="globus">{wdir}</profile>
+ <profile key="jobThrottle" namespace="karajan">5.99</profile>
+ <profile key="initialScore" namespace="karajan">10000</profile>
+ <profile namespace="globus" key="project">_PROJECT_</profile>
+ <profile namespace="globus" key="project">_QUEUE_</profile>
+ <workdirectory>{wdir}</workdirectory>
+</pool>
+</config>
+
+<!-- RESERVATIONS:
+Add something like this to your providerAttributes:
+pbs.resources=advres=modFTDock.47 -->
Deleted: branches/release-0.93.1/tests/sites/beagle/coasters/tc.template.data
===================================================================
--- branches/release-0.93/tests/sites/beagle/coasters/tc.template.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/coasters/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-beagle-pbs echo /bin/echo INSTALLED INTEL32::LINUX
-beagle-pbs cat /bin/cat INSTALLED INTEL32::LINUX
-beagle-pbs ls /bin/ls INSTALLED INTEL32::LINUX
-beagle-pbs grep /bin/grep INSTALLED INTEL32::LINUX
-beagle-pbs sort /bin/sort INSTALLED INTEL32::LINUX
-beagle-pbs paste /bin/paste INSTALLED INTEL32::LINUX
-beagle-pbs wc /usr/bin/wc INSTALLED INTEL32::LINUX
Copied: branches/release-0.93.1/tests/sites/beagle/coasters/tc.template.data (from rev 5504, branches/release-0.93/tests/sites/beagle/coasters/tc.template.data)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/coasters/tc.template.data (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/coasters/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+beagle-pbs echo /bin/echo INSTALLED INTEL32::LINUX
+beagle-pbs cat /bin/cat INSTALLED INTEL32::LINUX
+beagle-pbs ls /bin/ls INSTALLED INTEL32::LINUX
+beagle-pbs grep /bin/grep INSTALLED INTEL32::LINUX
+beagle-pbs sort /bin/sort INSTALLED INTEL32::LINUX
+beagle-pbs paste /bin/paste INSTALLED INTEL32::LINUX
+beagle-pbs wc /usr/bin/wc INSTALLED INTEL32::LINUX
Deleted: branches/release-0.93.1/tests/sites/beagle/coasters/title.txt
===================================================================
--- branches/release-0.93/tests/sites/beagle/coasters/title.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/coasters/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Local PBS Coasters: Beagle
Copied: branches/release-0.93.1/tests/sites/beagle/coasters/title.txt (from rev 5504, branches/release-0.93/tests/sites/beagle/coasters/title.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/coasters/title.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/coasters/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Local PBS Coasters: Beagle
Deleted: branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.check.sh
===================================================================
--- branches/release-0.93/tests/sites/beagle/pbs/001-catsn.check.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Pseudo-code for now
-
-# for f in *.out.expected
-# do
-# assert *.out exists
-# assert *.out.expected == *.out
-# done
Copied: branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.check.sh (from rev 5504, branches/release-0.93/tests/sites/beagle/pbs/001-catsn.check.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.check.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Pseudo-code for now
+
+# for f in *.out.expected
+# do
+# assert *.out exists
+# assert *.out.expected == *.out
+# done
Deleted: branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.setup.sh
===================================================================
--- branches/release-0.93/tests/sites/beagle/pbs/001-catsn.setup.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cp -v $GROUP/data.txt . || exit 1
-cp -v $GROUP/*expected . || exit 1
Copied: branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.setup.sh (from rev 5504, branches/release-0.93/tests/sites/beagle/pbs/001-catsn.setup.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.setup.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cp -v $GROUP/data.txt . || exit 1
+cp -v $GROUP/*expected . || exit 1
Deleted: branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.swift
===================================================================
--- branches/release-0.93/tests/sites/beagle/pbs/001-catsn.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,15 +0,0 @@
-type file;
-
-app (file o) cat (file i)
-{
- cat @i stdout=@o;
-}
-
-// string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-// string char[] = @strsplit(t, "");
-
-file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
-foreach j in [1:@toint(@arg("n","10"))] {
- file data<"data.txt">;
- out[j] = cat(data);
-}
Copied: branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.swift (from rev 5504, branches/release-0.93/tests/sites/beagle/pbs/001-catsn.swift)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.swift (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,15 @@
+type file;
+
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
+
+// string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+// string char[] = @strsplit(t, "");
+
+file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
+foreach j in [1:@toint(@arg("n","10"))] {
+ file data<"data.txt">;
+ out[j] = cat(data);
+}
Deleted: branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.timeout
===================================================================
--- branches/release-0.93/tests/sites/beagle/pbs/001-catsn.timeout 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-180
Copied: branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.timeout (from rev 5504, branches/release-0.93/tests/sites/beagle/pbs/001-catsn.timeout)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.timeout (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/001-catsn.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+180
Deleted: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0001.out.expected
===================================================================
--- branches/release-0.93/tests/sites/beagle/pbs/catsn.0001.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0001.out.expected (from rev 5504, branches/release-0.93/tests/sites/beagle/pbs/catsn.0001.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0001.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0002.out.expected
===================================================================
--- branches/release-0.93/tests/sites/beagle/pbs/catsn.0002.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0002.out.expected (from rev 5504, branches/release-0.93/tests/sites/beagle/pbs/catsn.0002.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0002.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0003.out.expected
===================================================================
--- branches/release-0.93/tests/sites/beagle/pbs/catsn.0003.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0003.out.expected (from rev 5504, branches/release-0.93/tests/sites/beagle/pbs/catsn.0003.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0003.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0004.out.expected
===================================================================
--- branches/release-0.93/tests/sites/beagle/pbs/catsn.0004.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0004.out.expected (from rev 5504, branches/release-0.93/tests/sites/beagle/pbs/catsn.0004.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0004.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0005.out.expected
===================================================================
--- branches/release-0.93/tests/sites/beagle/pbs/catsn.0005.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0005.out.expected (from rev 5504, branches/release-0.93/tests/sites/beagle/pbs/catsn.0005.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0005.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0006.out.expected
===================================================================
--- branches/release-0.93/tests/sites/beagle/pbs/catsn.0006.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0006.out.expected (from rev 5504, branches/release-0.93/tests/sites/beagle/pbs/catsn.0006.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0006.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0007.out.expected
===================================================================
--- branches/release-0.93/tests/sites/beagle/pbs/catsn.0007.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0007.out.expected (from rev 5504, branches/release-0.93/tests/sites/beagle/pbs/catsn.0007.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0007.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0008.out.expected
===================================================================
--- branches/release-0.93/tests/sites/beagle/pbs/catsn.0008.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0008.out.expected (from rev 5504, branches/release-0.93/tests/sites/beagle/pbs/catsn.0008.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0008.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0009.out.expected
===================================================================
--- branches/release-0.93/tests/sites/beagle/pbs/catsn.0009.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0009.out.expected (from rev 5504, branches/release-0.93/tests/sites/beagle/pbs/catsn.0009.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0009.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0010.out.expected
===================================================================
--- branches/release-0.93/tests/sites/beagle/pbs/catsn.0010.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0010.out.expected (from rev 5504, branches/release-0.93/tests/sites/beagle/pbs/catsn.0010.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0010.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/beagle/pbs/data.txt
===================================================================
--- branches/release-0.93/tests/sites/beagle/pbs/data.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/beagle/pbs/data.txt (from rev 5504, branches/release-0.93/tests/sites/beagle/pbs/data.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/pbs/data.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/beagle/pbs/sites.template.xml
===================================================================
--- branches/release-0.93/tests/sites/beagle/pbs/sites.template.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,18 +0,0 @@
-<config>
-
-<import file="sys.xml"/>
-<set name="wdir" value="/lustre/beagle/{user.name}/work"/>
-<echo message="setting workDirectory to: {wdir}"/>
-
-<pool handle="beagle-pbs">
- <execution provider="pbs" url="none" />
- <filesystem provider="local" url="none" />
- <profile namespace="globus" key="pbs.aprun"/>
- <profile namespace="globus" key="pbs.mpp"/>
- <workdirectory>{wdir}</workdirectory>
-</pool>
-</config>
-
-<!-- RESERVATIONS:
-Add something like this to your globus namespace:
-pbs.resources=advres=modFTDock.47 -->
Copied: branches/release-0.93.1/tests/sites/beagle/pbs/sites.template.xml (from rev 5504, branches/release-0.93/tests/sites/beagle/pbs/sites.template.xml)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/pbs/sites.template.xml (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,18 @@
+<config>
+
+<import file="sys.xml"/>
+<set name="wdir" value="/lustre/beagle/{user.name}/work"/>
+<echo message="setting workDirectory to: {wdir}"/>
+
+<pool handle="beagle-pbs">
+ <execution provider="pbs" url="none" />
+ <filesystem provider="local" url="none" />
+ <profile namespace="globus" key="pbs.aprun"/>
+ <profile namespace="globus" key="pbs.mpp"/>
+ <workdirectory>{wdir}</workdirectory>
+</pool>
+</config>
+
+<!-- RESERVATIONS:
+Add something like this to your globus namespace:
+pbs.resources=advres=modFTDock.47 -->
Deleted: branches/release-0.93.1/tests/sites/beagle/pbs/tc.template.data
===================================================================
--- branches/release-0.93/tests/sites/beagle/pbs/tc.template.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-beagle-pbs echo /bin/echo INSTALLED INTEL32::LINUX
-beagle-pbs cat /bin/cat INSTALLED INTEL32::LINUX
-beagle-pbs ls /bin/ls INSTALLED INTEL32::LINUX
-beagle-pbs grep /bin/grep INSTALLED INTEL32::LINUX
-beagle-pbs sort /bin/sort INSTALLED INTEL32::LINUX
-beagle-pbs paste /bin/paste INSTALLED INTEL32::LINUX
-beagle-pbs wc /usr/bin/wc INSTALLED INTEL32::LINUX
Copied: branches/release-0.93.1/tests/sites/beagle/pbs/tc.template.data (from rev 5504, branches/release-0.93/tests/sites/beagle/pbs/tc.template.data)
===================================================================
--- branches/release-0.93.1/tests/sites/beagle/pbs/tc.template.data (rev 0)
+++ branches/release-0.93.1/tests/sites/beagle/pbs/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+beagle-pbs echo /bin/echo INSTALLED INTEL32::LINUX
+beagle-pbs cat /bin/cat INSTALLED INTEL32::LINUX
+beagle-pbs ls /bin/ls INSTALLED INTEL32::LINUX
+beagle-pbs grep /bin/grep INSTALLED INTEL32::LINUX
+beagle-pbs sort /bin/sort INSTALLED INTEL32::LINUX
+beagle-pbs paste /bin/paste INSTALLED INTEL32::LINUX
+beagle-pbs wc /usr/bin/wc INSTALLED INTEL32::LINUX
Deleted: branches/release-0.93.1/tests/sites/crow/001-catsn.check.sh
===================================================================
--- branches/release-0.93/tests/sites/crow/001-catsn.check.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/crow/001-catsn.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -x
-
-COUNT=$( ls catsn.*.out | wc -l )
-[[ $COUNT == 10 ]] || exit 1
-
-exit 0
Copied: branches/release-0.93.1/tests/sites/crow/001-catsn.check.sh (from rev 5504, branches/release-0.93/tests/sites/crow/001-catsn.check.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/crow/001-catsn.check.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/crow/001-catsn.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -x
+
+COUNT=$( ls catsn.*.out | wc -l )
+[[ $COUNT == 10 ]] || exit 1
+
+exit 0
Deleted: branches/release-0.93.1/tests/sites/crow/001-catsn.clean.sh
===================================================================
--- branches/release-0.93/tests/sites/crow/001-catsn.clean.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/crow/001-catsn.clean.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -x
-
-rm -v catsn.*.out || exit 1
-
-exit 0
Copied: branches/release-0.93.1/tests/sites/crow/001-catsn.clean.sh (from rev 5504, branches/release-0.93/tests/sites/crow/001-catsn.clean.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/crow/001-catsn.clean.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/crow/001-catsn.clean.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -x
+
+rm -v catsn.*.out || exit 1
+
+exit 0
Deleted: branches/release-0.93.1/tests/sites/crow/001-catsn.setup.sh
===================================================================
--- branches/release-0.93/tests/sites/crow/001-catsn.setup.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/crow/001-catsn.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-cp -v $GROUP/data.txt . || exit 1
Copied: branches/release-0.93.1/tests/sites/crow/001-catsn.setup.sh (from rev 5504, branches/release-0.93/tests/sites/crow/001-catsn.setup.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/crow/001-catsn.setup.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/crow/001-catsn.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cp -v $GROUP/data.txt . || exit 1
Deleted: branches/release-0.93.1/tests/sites/crow/001-catsn.swift
===================================================================
--- branches/release-0.93/tests/sites/crow/001-catsn.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/crow/001-catsn.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,12 +0,0 @@
-type file;
-
-app (file o) cat (file i)
-{
- cat @i stdout=@o;
-}
-
-file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
-foreach j in [1:@toint(@arg("n","10"))] {
- file data<"data.txt">;
- out[j] = cat(data);
-}
Copied: branches/release-0.93.1/tests/sites/crow/001-catsn.swift (from rev 5504, branches/release-0.93/tests/sites/crow/001-catsn.swift)
===================================================================
--- branches/release-0.93.1/tests/sites/crow/001-catsn.swift (rev 0)
+++ branches/release-0.93.1/tests/sites/crow/001-catsn.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,12 @@
+type file;
+
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
+
+file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
+foreach j in [1:@toint(@arg("n","10"))] {
+ file data<"data.txt">;
+ out[j] = cat(data);
+}
Deleted: branches/release-0.93.1/tests/sites/crow/001-catsn.timeout
===================================================================
--- branches/release-0.93/tests/sites/crow/001-catsn.timeout 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/crow/001-catsn.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-1000
Copied: branches/release-0.93.1/tests/sites/crow/001-catsn.timeout (from rev 5504, branches/release-0.93/tests/sites/crow/001-catsn.timeout)
===================================================================
--- branches/release-0.93.1/tests/sites/crow/001-catsn.timeout (rev 0)
+++ branches/release-0.93.1/tests/sites/crow/001-catsn.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+1000
Deleted: branches/release-0.93.1/tests/sites/crow/big/201-cps.check.sh
===================================================================
--- branches/release-0.93/tests/sites/crow/big/201-cps.check.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/crow/big/201-cps.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -x
-
-COUNT=$( ls 201-output* | wc -l )
-
-[[ $COUNT == 40 ]] || exit 1
-
-exit 0
Copied: branches/release-0.93.1/tests/sites/crow/big/201-cps.check.sh (from rev 5504, branches/release-0.93/tests/sites/crow/big/201-cps.check.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/crow/big/201-cps.check.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/crow/big/201-cps.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -x
+
+COUNT=$( ls 201-output* | wc -l )
+
+[[ $COUNT == 40 ]] || exit 1
+
+exit 0
Deleted: branches/release-0.93.1/tests/sites/crow/big/201-cps.clean.sh
===================================================================
--- branches/release-0.93/tests/sites/crow/big/201-cps.clean.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/crow/big/201-cps.clean.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -x
-
-rm -rv 201-output-[12]-*.txt || exit 1
-
-exit 0
Copied: branches/release-0.93.1/tests/sites/crow/big/201-cps.clean.sh (from rev 5504, branches/release-0.93/tests/sites/crow/big/201-cps.clean.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/crow/big/201-cps.clean.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/crow/big/201-cps.clean.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -x
+
+rm -rv 201-output-[12]-*.txt || exit 1
+
+exit 0
Deleted: branches/release-0.93.1/tests/sites/crow/big/201-cps.setup.sh
===================================================================
--- branches/release-0.93/tests/sites/crow/big/201-cps.setup.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/crow/big/201-cps.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -x
-
-{
- uname -a
- date
-} > 201-input-1.txt
-
-cp -v 201-input-1.txt 201-input-2.txt
-
-exit 0
Copied: branches/release-0.93.1/tests/sites/crow/big/201-cps.setup.sh (from rev 5504, branches/release-0.93/tests/sites/crow/big/201-cps.setup.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/crow/big/201-cps.setup.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/crow/big/201-cps.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -x
+
+{
+ uname -a
+ date
+} > 201-input-1.txt
+
+cp -v 201-input-1.txt 201-input-2.txt
+
+exit 0
Deleted: branches/release-0.93.1/tests/sites/crow/big/201-cps.swift
===================================================================
--- branches/release-0.93/tests/sites/crow/big/201-cps.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/crow/big/201-cps.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,24 +0,0 @@
-
-type file;
-
-app (file o) cps(file i, int s)
-{
- cps @o @i s;
-}
-
-file input1<"201-input-1.txt">;
-file input2<"201-input-2.txt">;
-
-foreach i in [1:20]
-{
- string s = @strcat("201-output-1-", i, ".txt");
- file output<single_file_mapper;file=s>;
- output = cps(input1, i);
-}
-
-foreach j in [1:20]
-{
- string s = @strcat("201-output-2-", j, ".txt");
- file output<single_file_mapper;file=s>;
- output = cps(input2, 10+j);
-}
Copied: branches/release-0.93.1/tests/sites/crow/big/201-cps.swift (from rev 5504, branches/release-0.93/tests/sites/crow/big/201-cps.swift)
===================================================================
--- branches/release-0.93.1/tests/sites/crow/big/201-cps.swift (rev 0)
+++ branches/release-0.93.1/tests/sites/crow/big/201-cps.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,24 @@
+
+type file;
+
+app (file o) cps(file i, int s)
+{
+ cps @o @i s;
+}
+
+file input1<"201-input-1.txt">;
+file input2<"201-input-2.txt">;
+
+foreach i in [1:20]
+{
+ string s = @strcat("201-output-1-", i, ".txt");
+ file output<single_file_mapper;file=s>;
+ output = cps(input1, i);
+}
+
+foreach j in [1:20]
+{
+ string s = @strcat("201-output-2-", j, ".txt");
+ file output<single_file_mapper;file=s>;
+ output = cps(input2, 10+j);
+}
Deleted: branches/release-0.93.1/tests/sites/crow/big/201-cps.timeout
===================================================================
--- branches/release-0.93/tests/sites/crow/big/201-cps.timeout 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/crow/big/201-cps.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-1000
Copied: branches/release-0.93.1/tests/sites/crow/big/201-cps.timeout (from rev 5504, branches/release-0.93/tests/sites/crow/big/201-cps.timeout)
===================================================================
--- branches/release-0.93.1/tests/sites/crow/big/201-cps.timeout (rev 0)
+++ branches/release-0.93.1/tests/sites/crow/big/201-cps.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+1000
Deleted: branches/release-0.93.1/tests/sites/crow/big/cps.sh
===================================================================
--- branches/release-0.93/tests/sites/crow/big/cps.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/crow/big/cps.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-DEST=$1
-SRC=$2
-DURATION=$3
-
-sleep $DURATION
-cp -v $SRC $DEST
-
Copied: branches/release-0.93.1/tests/sites/crow/big/cps.sh (from rev 5504, branches/release-0.93/tests/sites/crow/big/cps.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/crow/big/cps.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/crow/big/cps.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+DEST=$1
+SRC=$2
+DURATION=$3
+
+sleep $DURATION
+cp -v $SRC $DEST
+
Deleted: branches/release-0.93.1/tests/sites/crow/big/data.txt
===================================================================
--- branches/release-0.93/tests/sites/crow/big/data.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/crow/big/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-HELLO
Copied: branches/release-0.93.1/tests/sites/crow/big/data.txt (from rev 5504, branches/release-0.93/tests/sites/crow/big/data.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/crow/big/data.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/crow/big/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+HELLO
Deleted: branches/release-0.93.1/tests/sites/crow/big/sites.template.xml
===================================================================
--- branches/release-0.93/tests/sites/crow/big/sites.template.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/crow/big/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,29 +0,0 @@
-<config>
-
-<import file="sys.xml"/>
-<set name="wdir" value="_WORK_"/>
-
-<pool handle="crow">
- <execution jobmanager="local:pbs" provider="coaster" url="none"/>
- <filesystem provider="local" url="none" />
- <profile namespace="globus" key="maxWallTime">1</profile>
- <profile namespace="globus" key="maxTime">7200</profile>
-
- <profile namespace="globus" key="providerAttributes">
- pbs.aprun;pbs.mpp;depth=6
- </profile>
- <profile key="jobsPerNode" namespace="globus">6</profile>
- <profile key="slots" namespace="globus">2</profile>
- <profile key="nodeGranularity" namespace="globus">4</profile>
- <profile key="maxNodes" namespace="globus">16</profile>
- <profile key="workerLoggingLevel" namespace="globus">DEBUG</profile>
- <profile key="workerLoggingDirectory" namespace="globus">{wdir}</profile>
- <profile key="jobThrottle" namespace="karajan">5.99</profile>
- <profile key="initialScore" namespace="karajan">10000</profile>
- <workdirectory>{wdir}</workdirectory>
-</pool>
-</config>
-
-<!-- RESERVATIONS:
-Add something like this to your providerAttributes:
-pbs.resources=advres=modFTDock.47 -->
Copied: branches/release-0.93.1/tests/sites/crow/big/sites.template.xml (from rev 5504, branches/release-0.93/tests/sites/crow/big/sites.template.xml)
===================================================================
--- branches/release-0.93.1/tests/sites/crow/big/sites.template.xml (rev 0)
+++ branches/release-0.93.1/tests/sites/crow/big/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,29 @@
+<config>
+
+<import file="sys.xml"/>
+<set name="wdir" value="_WORK_"/>
+
+<pool handle="crow">
+ <execution jobmanager="local:pbs" provider="coaster" url="none"/>
+ <filesystem provider="local" url="none" />
+ <profile namespace="globus" key="maxWallTime">1</profile>
+ <profile namespace="globus" key="maxTime">7200</profile>
+
+ <profile namespace="globus" key="providerAttributes">
+ pbs.aprun;pbs.mpp;depth=6
+ </profile>
+ <profile key="jobsPerNode" namespace="globus">6</profile>
+ <profile key="slots" namespace="globus">2</profile>
+ <profile key="nodeGranularity" namespace="globus">4</profile>
+ <profile key="maxNodes" namespace="globus">16</profile>
+ <profile key="workerLoggingLevel" namespace="globus">DEBUG</profile>
+ <profile key="workerLoggingDirectory" namespace="globus">{wdir}</profile>
+ <profile key="jobThrottle" namespace="karajan">5.99</profile>
+ <profile key="initialScore" namespace="karajan">10000</profile>
+ <workdirectory>{wdir}</workdirectory>
+</pool>
+</config>
+
+<!-- RESERVATIONS:
+Add something like this to your providerAttributes:
+pbs.resources=advres=modFTDock.47 -->
Deleted: branches/release-0.93.1/tests/sites/crow/big/title.txt
===================================================================
--- branches/release-0.93/tests/sites/crow/big/title.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/crow/big/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Local PBS Coasters: Crow big
Copied: branches/release-0.93.1/tests/sites/crow/big/title.txt (from rev 5504, branches/release-0.93/tests/sites/crow/big/title.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/crow/big/title.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/crow/big/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Local PBS Coasters: Crow big
Deleted: branches/release-0.93.1/tests/sites/crow/data.txt
===================================================================
--- branches/release-0.93/tests/sites/crow/data.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/crow/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-HELLO
Copied: branches/release-0.93.1/tests/sites/crow/data.txt (from rev 5504, branches/release-0.93/tests/sites/crow/data.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/crow/data.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/crow/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+HELLO
Deleted: branches/release-0.93.1/tests/sites/crow/sites.template.xml
===================================================================
--- branches/release-0.93/tests/sites/crow/sites.template.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/crow/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,31 +0,0 @@
-<config>
-
-<import file="sys.xml"/>
-<set name="pwd"><sys:getenv name="PWD"/></set>
-<set name="wdir" value="{pwd}/work"/>
-<echo message="setting workDirectory to: {wdir}"/>
-
-<pool handle="crow">
- <execution jobmanager="local:pbs" provider="coaster" url="none"/>
- <filesystem provider="local" url="none" />
- <profile namespace="globus" key="maxWallTime">1</profile>
- <profile namespace="globus" key="maxTime">7200</profile>
-
- <profile namespace="globus" key="providerAttributes">
- pbs.aprun;pbs.mpp;depth=6
- </profile>
- <profile key="jobsPerNode" namespace="globus">6</profile>
- <profile key="slots" namespace="globus">1</profile>
- <profile key="nodeGranularity" namespace="globus">1</profile>
- <profile key="maxNodes" namespace="globus">1</profile>
- <profile key="workerLoggingLevel" namespace="globus">DEBUG</profile>
- <profile key="workerLoggingDirectory" namespace="globus">{wdir}</profile>
- <profile key="jobThrottle" namespace="karajan">5.99</profile>
- <profile key="initialScore" namespace="karajan">10000</profile>
- <workdirectory>{wdir}</workdirectory>
-</pool>
-</config>
-
-<!-- RESERVATIONS:
-Add something like this to your providerAttributes:
-pbs.resources=advres=modFTDock.47 -->
Copied: branches/release-0.93.1/tests/sites/crow/sites.template.xml (from rev 5504, branches/release-0.93/tests/sites/crow/sites.template.xml)
===================================================================
--- branches/release-0.93.1/tests/sites/crow/sites.template.xml (rev 0)
+++ branches/release-0.93.1/tests/sites/crow/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,31 @@
+<config>
+
+<import file="sys.xml"/>
+<set name="pwd"><sys:getenv name="PWD"/></set>
+<set name="wdir" value="{pwd}/work"/>
+<echo message="setting workDirectory to: {wdir}"/>
+
+<pool handle="crow">
+ <execution jobmanager="local:pbs" provider="coaster" url="none"/>
+ <filesystem provider="local" url="none" />
+ <profile namespace="globus" key="maxWallTime">1</profile>
+ <profile namespace="globus" key="maxTime">7200</profile>
+
+ <profile namespace="globus" key="providerAttributes">
+ pbs.aprun;pbs.mpp;depth=6
+ </profile>
+ <profile key="jobsPerNode" namespace="globus">6</profile>
+ <profile key="slots" namespace="globus">1</profile>
+ <profile key="nodeGranularity" namespace="globus">1</profile>
+ <profile key="maxNodes" namespace="globus">1</profile>
+ <profile key="workerLoggingLevel" namespace="globus">DEBUG</profile>
+ <profile key="workerLoggingDirectory" namespace="globus">{wdir}</profile>
+ <profile key="jobThrottle" namespace="karajan">5.99</profile>
+ <profile key="initialScore" namespace="karajan">10000</profile>
+ <workdirectory>{wdir}</workdirectory>
+</pool>
+</config>
+
+<!-- RESERVATIONS:
+Add something like this to your providerAttributes:
+pbs.resources=advres=modFTDock.47 -->
Deleted: branches/release-0.93.1/tests/sites/crow/tc.template.data
===================================================================
--- branches/release-0.93/tests/sites/crow/tc.template.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/crow/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-crow echo /bin/echo INSTALLED INTEL32::LINUX
-crow cat /bin/cat INSTALLED INTEL32::LINUX
-crow ls /bin/ls INSTALLED INTEL32::LINUX
-crow grep /bin/grep INSTALLED INTEL32::LINUX
-crow sort /bin/sort INSTALLED INTEL32::LINUX
-crow paste /bin/paste INSTALLED INTEL32::LINUX
-crow wc /usr/bin/wc INSTALLED INTEL32::LINUX
Copied: branches/release-0.93.1/tests/sites/crow/tc.template.data (from rev 5504, branches/release-0.93/tests/sites/crow/tc.template.data)
===================================================================
--- branches/release-0.93.1/tests/sites/crow/tc.template.data (rev 0)
+++ branches/release-0.93.1/tests/sites/crow/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+crow echo /bin/echo INSTALLED INTEL32::LINUX
+crow cat /bin/cat INSTALLED INTEL32::LINUX
+crow ls /bin/ls INSTALLED INTEL32::LINUX
+crow grep /bin/grep INSTALLED INTEL32::LINUX
+crow sort /bin/sort INSTALLED INTEL32::LINUX
+crow paste /bin/paste INSTALLED INTEL32::LINUX
+crow wc /usr/bin/wc INSTALLED INTEL32::LINUX
Deleted: branches/release-0.93.1/tests/sites/crow/title.txt
===================================================================
--- branches/release-0.93/tests/sites/crow/title.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/crow/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Local PBS Coasters: Crow
Copied: branches/release-0.93.1/tests/sites/crow/title.txt (from rev 5504, branches/release-0.93/tests/sites/crow/title.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/crow/title.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/crow/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Local PBS Coasters: Crow
Deleted: branches/release-0.93.1/tests/sites/fusion/catsn.0001.out.expected
===================================================================
--- branches/release-0.93/tests/sites/fusion/catsn.0001.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/fusion/catsn.0001.out.expected (from rev 5504, branches/release-0.93/tests/sites/fusion/catsn.0001.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/fusion/catsn.0001.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/fusion/catsn.0002.out.expected
===================================================================
--- branches/release-0.93/tests/sites/fusion/catsn.0002.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/fusion/catsn.0002.out.expected (from rev 5504, branches/release-0.93/tests/sites/fusion/catsn.0002.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/fusion/catsn.0002.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/fusion/catsn.0003.out.expected
===================================================================
--- branches/release-0.93/tests/sites/fusion/catsn.0003.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/fusion/catsn.0003.out.expected (from rev 5504, branches/release-0.93/tests/sites/fusion/catsn.0003.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/fusion/catsn.0003.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/fusion/catsn.0004.out.expected
===================================================================
--- branches/release-0.93/tests/sites/fusion/catsn.0004.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/fusion/catsn.0004.out.expected (from rev 5504, branches/release-0.93/tests/sites/fusion/catsn.0004.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/fusion/catsn.0004.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/fusion/catsn.0005.out.expected
===================================================================
--- branches/release-0.93/tests/sites/fusion/catsn.0005.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/fusion/catsn.0005.out.expected (from rev 5504, branches/release-0.93/tests/sites/fusion/catsn.0005.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/fusion/catsn.0005.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/fusion/catsn.0006.out.expected
===================================================================
--- branches/release-0.93/tests/sites/fusion/catsn.0006.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/fusion/catsn.0006.out.expected (from rev 5504, branches/release-0.93/tests/sites/fusion/catsn.0006.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/fusion/catsn.0006.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/fusion/catsn.0007.out.expected
===================================================================
--- branches/release-0.93/tests/sites/fusion/catsn.0007.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/fusion/catsn.0007.out.expected (from rev 5504, branches/release-0.93/tests/sites/fusion/catsn.0007.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/fusion/catsn.0007.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/fusion/catsn.0008.out.expected
===================================================================
--- branches/release-0.93/tests/sites/fusion/catsn.0008.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/fusion/catsn.0008.out.expected (from rev 5504, branches/release-0.93/tests/sites/fusion/catsn.0008.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/fusion/catsn.0008.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/fusion/catsn.0009.out.expected
===================================================================
--- branches/release-0.93/tests/sites/fusion/catsn.0009.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/fusion/catsn.0009.out.expected (from rev 5504, branches/release-0.93/tests/sites/fusion/catsn.0009.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/fusion/catsn.0009.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/fusion/catsn.0010.out.expected
===================================================================
--- branches/release-0.93/tests/sites/fusion/catsn.0010.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/fusion/catsn.0010.out.expected (from rev 5504, branches/release-0.93/tests/sites/fusion/catsn.0010.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/fusion/catsn.0010.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/fusion/catsn.setup.sh
===================================================================
--- branches/release-0.93/tests/sites/fusion/catsn.setup.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-cp -v $GROUP/data.txt . || exit 1
-ipaddr=$( ifconfig | grep inet | head -1 | cut -d ':' -f 2 | awk '{print $1}' )
-export GLOBUS_HOSTNAME=$ipaddr
-
Copied: branches/release-0.93.1/tests/sites/fusion/catsn.setup.sh (from rev 5504, branches/release-0.93/tests/sites/fusion/catsn.setup.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/fusion/catsn.setup.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cp -v $GROUP/data.txt . || exit 1
+ipaddr=$( ifconfig | grep inet | head -1 | cut -d ':' -f 2 | awk '{print $1}' )
+export GLOBUS_HOSTNAME=$ipaddr
+
Deleted: branches/release-0.93.1/tests/sites/fusion/catsn.swift
===================================================================
--- branches/release-0.93/tests/sites/fusion/catsn.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,15 +0,0 @@
-type file;
-
-app (file o) cat (file i)
-{
- cat @i stdout=@o;
-}
-
-string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-string char[] = @strsplit(t, "");
-
-file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
-foreach j in [1:@toint(@arg("n","10"))] {
- file data<"data.txt">;
- out[j] = cat(data);
-}
Copied: branches/release-0.93.1/tests/sites/fusion/catsn.swift (from rev 5504, branches/release-0.93/tests/sites/fusion/catsn.swift)
===================================================================
--- branches/release-0.93.1/tests/sites/fusion/catsn.swift (rev 0)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,15 @@
+type file;
+
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
+
+string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+string char[] = @strsplit(t, "");
+
+file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
+foreach j in [1:@toint(@arg("n","10"))] {
+ file data<"data.txt">;
+ out[j] = cat(data);
+}
Deleted: branches/release-0.93.1/tests/sites/fusion/catsn.timeout
===================================================================
--- branches/release-0.93/tests/sites/fusion/catsn.timeout 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-30
Copied: branches/release-0.93.1/tests/sites/fusion/catsn.timeout (from rev 5504, branches/release-0.93/tests/sites/fusion/catsn.timeout)
===================================================================
--- branches/release-0.93.1/tests/sites/fusion/catsn.timeout (rev 0)
+++ branches/release-0.93.1/tests/sites/fusion/catsn.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+30
Deleted: branches/release-0.93.1/tests/sites/fusion/data.txt
===================================================================
--- branches/release-0.93/tests/sites/fusion/data.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/fusion/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/fusion/data.txt (from rev 5504, branches/release-0.93/tests/sites/fusion/data.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/fusion/data.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/fusion/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/fusion/sites.template.xml
===================================================================
--- branches/release-0.93/tests/sites/fusion/sites.template.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/fusion/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,16 +0,0 @@
-<config>
-<pool handle="fusion">
- <execution jobmanager="local:pbs" provider="coaster" url="none"/>
- <filesystem provider="local" url="none" />
- <profile namespace="globus" key="maxtime">750</profile>
- <profile namespace="globus" key="jobsPerNode">1</profile>
- <profile namespace="globus" key="slots">1</profile>
- <profile namespace="globus" key="nodeGranularity">1</profile>
- <profile namespace="globus" key="maxNodes">2</profile>
- <profile namespace="globus" key="queue">shared</profile>
- <profile namespace="karajan" key="jobThrottle">5.99</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <workdirectory>_WORK_</workdirectory>
-</pool>
-</config>
-
Copied: branches/release-0.93.1/tests/sites/fusion/sites.template.xml (from rev 5504, branches/release-0.93/tests/sites/fusion/sites.template.xml)
===================================================================
--- branches/release-0.93.1/tests/sites/fusion/sites.template.xml (rev 0)
+++ branches/release-0.93.1/tests/sites/fusion/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,16 @@
+<config>
+<pool handle="fusion">
+ <execution jobmanager="local:pbs" provider="coaster" url="none"/>
+ <filesystem provider="local" url="none" />
+ <profile namespace="globus" key="maxtime">750</profile>
+ <profile namespace="globus" key="jobsPerNode">1</profile>
+ <profile namespace="globus" key="slots">1</profile>
+ <profile namespace="globus" key="nodeGranularity">1</profile>
+ <profile namespace="globus" key="maxNodes">2</profile>
+ <profile namespace="globus" key="queue">shared</profile>
+ <profile namespace="karajan" key="jobThrottle">5.99</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <workdirectory>_WORK_</workdirectory>
+</pool>
+</config>
+
Deleted: branches/release-0.93.1/tests/sites/fusion/tc.template.data
===================================================================
--- branches/release-0.93/tests/sites/fusion/tc.template.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/fusion/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-fusion echo /bin/echo INSTALLED INTEL32::LINUX
-fusion cat /bin/cat INSTALLED INTEL32::LINUX
-fusion ls /bin/ls INSTALLED INTEL32::LINUX
-fusion grep /bin/grep INSTALLED INTEL32::LINUX
-fusion sort /bin/sort INSTALLED INTEL32::LINUX
-fusion paste /bin/paste INSTALLED INTEL32::LINUX
-fusion wc /usr/bin/wc INSTALLED INTEL32::LINUX
Copied: branches/release-0.93.1/tests/sites/fusion/tc.template.data (from rev 5504, branches/release-0.93/tests/sites/fusion/tc.template.data)
===================================================================
--- branches/release-0.93.1/tests/sites/fusion/tc.template.data (rev 0)
+++ branches/release-0.93.1/tests/sites/fusion/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+fusion echo /bin/echo INSTALLED INTEL32::LINUX
+fusion cat /bin/cat INSTALLED INTEL32::LINUX
+fusion ls /bin/ls INSTALLED INTEL32::LINUX
+fusion grep /bin/grep INSTALLED INTEL32::LINUX
+fusion sort /bin/sort INSTALLED INTEL32::LINUX
+fusion paste /bin/paste INSTALLED INTEL32::LINUX
+fusion wc /usr/bin/wc INSTALLED INTEL32::LINUX
Deleted: branches/release-0.93.1/tests/sites/ibicluster/catsn.0001.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ibicluster/catsn.0001.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-blah blah
Copied: branches/release-0.93.1/tests/sites/ibicluster/catsn.0001.out.expected (from rev 5504, branches/release-0.93/tests/sites/ibicluster/catsn.0001.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ibicluster/catsn.0001.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+blah blah
Deleted: branches/release-0.93.1/tests/sites/ibicluster/catsn.0002.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ibicluster/catsn.0002.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-blah blah
Copied: branches/release-0.93.1/tests/sites/ibicluster/catsn.0002.out.expected (from rev 5504, branches/release-0.93/tests/sites/ibicluster/catsn.0002.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ibicluster/catsn.0002.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+blah blah
Deleted: branches/release-0.93.1/tests/sites/ibicluster/catsn.0003.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ibicluster/catsn.0003.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-blah blah
Copied: branches/release-0.93.1/tests/sites/ibicluster/catsn.0003.out.expected (from rev 5504, branches/release-0.93/tests/sites/ibicluster/catsn.0003.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ibicluster/catsn.0003.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+blah blah
Deleted: branches/release-0.93.1/tests/sites/ibicluster/catsn.0004.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ibicluster/catsn.0004.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-blah blah
Copied: branches/release-0.93.1/tests/sites/ibicluster/catsn.0004.out.expected (from rev 5504, branches/release-0.93/tests/sites/ibicluster/catsn.0004.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ibicluster/catsn.0004.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+blah blah
Deleted: branches/release-0.93.1/tests/sites/ibicluster/catsn.0005.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ibicluster/catsn.0005.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-blah blah
Copied: branches/release-0.93.1/tests/sites/ibicluster/catsn.0005.out.expected (from rev 5504, branches/release-0.93/tests/sites/ibicluster/catsn.0005.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ibicluster/catsn.0005.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+blah blah
Deleted: branches/release-0.93.1/tests/sites/ibicluster/catsn.0006.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ibicluster/catsn.0006.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-blah blah
Copied: branches/release-0.93.1/tests/sites/ibicluster/catsn.0006.out.expected (from rev 5504, branches/release-0.93/tests/sites/ibicluster/catsn.0006.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ibicluster/catsn.0006.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+blah blah
Deleted: branches/release-0.93.1/tests/sites/ibicluster/catsn.0007.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ibicluster/catsn.0007.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-blah blah
Copied: branches/release-0.93.1/tests/sites/ibicluster/catsn.0007.out.expected (from rev 5504, branches/release-0.93/tests/sites/ibicluster/catsn.0007.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ibicluster/catsn.0007.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+blah blah
Deleted: branches/release-0.93.1/tests/sites/ibicluster/catsn.0008.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ibicluster/catsn.0008.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-blah blah
Copied: branches/release-0.93.1/tests/sites/ibicluster/catsn.0008.out.expected (from rev 5504, branches/release-0.93/tests/sites/ibicluster/catsn.0008.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ibicluster/catsn.0008.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+blah blah
Deleted: branches/release-0.93.1/tests/sites/ibicluster/catsn.0009.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ibicluster/catsn.0009.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-blah blah
Copied: branches/release-0.93.1/tests/sites/ibicluster/catsn.0009.out.expected (from rev 5504, branches/release-0.93/tests/sites/ibicluster/catsn.0009.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ibicluster/catsn.0009.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+blah blah
Deleted: branches/release-0.93.1/tests/sites/ibicluster/catsn.0010.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ibicluster/catsn.0010.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-blah blah
Copied: branches/release-0.93.1/tests/sites/ibicluster/catsn.0010.out.expected (from rev 5504, branches/release-0.93/tests/sites/ibicluster/catsn.0010.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ibicluster/catsn.0010.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+blah blah
Deleted: branches/release-0.93.1/tests/sites/ibicluster/catsn.check.sh
===================================================================
--- branches/release-0.93/tests/sites/ibicluster/catsn.check.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -x
-
-for count in `seq --format "%04.f" 1 1 10`
-do
- [ -f catsn.$count.out ] || exit 1
- CONTENTS1=$( cat catsn.$count.out.expected )
- CONTENTS2=$( cat catsn.$count.out )
- [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1
-done
-exit 0
Copied: branches/release-0.93.1/tests/sites/ibicluster/catsn.check.sh (from rev 5504, branches/release-0.93/tests/sites/ibicluster/catsn.check.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/ibicluster/catsn.check.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -x
+
+for count in `seq --format "%04.f" 1 1 10`
+do
+ [ -f catsn.$count.out ] || exit 1
+ CONTENTS1=$( cat catsn.$count.out.expected )
+ CONTENTS2=$( cat catsn.$count.out )
+ [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1
+done
+exit 0
Deleted: branches/release-0.93.1/tests/sites/ibicluster/catsn.setup.sh
===================================================================
--- branches/release-0.93/tests/sites/ibicluster/catsn.setup.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-cp -v $GROUP/data.txt . || exit 1
-cp -v $GROUP/*expected . || exit 1
-
-export QUEUE=normal
-
Copied: branches/release-0.93.1/tests/sites/ibicluster/catsn.setup.sh (from rev 5504, branches/release-0.93/tests/sites/ibicluster/catsn.setup.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/ibicluster/catsn.setup.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+cp -v $GROUP/data.txt . || exit 1
+cp -v $GROUP/*expected . || exit 1
+
+export QUEUE=normal
+
Deleted: branches/release-0.93.1/tests/sites/ibicluster/catsn.swift
===================================================================
--- branches/release-0.93/tests/sites/ibicluster/catsn.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,12 +0,0 @@
-type file;
-
-app (file o) cat (file i)
-{
- cat @i stdout=@o;
-}
-
-file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
-foreach j in [1:@toint(@arg("n","10"))] {
- file data<"data.txt">;
- out[j] = cat(data);
-}
Copied: branches/release-0.93.1/tests/sites/ibicluster/catsn.swift (from rev 5504, branches/release-0.93/tests/sites/ibicluster/catsn.swift)
===================================================================
--- branches/release-0.93.1/tests/sites/ibicluster/catsn.swift (rev 0)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,12 @@
+type file;
+
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
+
+file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
+foreach j in [1:@toint(@arg("n","10"))] {
+ file data<"data.txt">;
+ out[j] = cat(data);
+}
Deleted: branches/release-0.93.1/tests/sites/ibicluster/catsn.timeout
===================================================================
--- branches/release-0.93/tests/sites/ibicluster/catsn.timeout 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-1800
Copied: branches/release-0.93.1/tests/sites/ibicluster/catsn.timeout (from rev 5504, branches/release-0.93/tests/sites/ibicluster/catsn.timeout)
===================================================================
--- branches/release-0.93.1/tests/sites/ibicluster/catsn.timeout (rev 0)
+++ branches/release-0.93.1/tests/sites/ibicluster/catsn.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+1800
Deleted: branches/release-0.93.1/tests/sites/ibicluster/data.txt
===================================================================
--- branches/release-0.93/tests/sites/ibicluster/data.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ibicluster/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-blah blah
Copied: branches/release-0.93.1/tests/sites/ibicluster/data.txt (from rev 5504, branches/release-0.93/tests/sites/ibicluster/data.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/ibicluster/data.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/ibicluster/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+blah blah
Deleted: branches/release-0.93.1/tests/sites/ibicluster/sites.template.xml
===================================================================
--- branches/release-0.93/tests/sites/ibicluster/sites.template.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ibicluster/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,14 +0,0 @@
-<config>
- <pool handle="ibicluster">
- <execution provider="coaster" url="none" jobmanager="local:sge"/>
- <profile namespace="globus" key="pe">threaded</profile>
- <profile namespace="globus" key="queue">all.q</profile>
- <profile namespace="globus" key="jobsPerNode">8</profile>
- <profile namespace="globus" key="nodeGranularity">1</profile>
- <profile namespace="globus" key="maxnodes">2</profile>
- <profile namespace="karajan" key="jobThrottle">0.159</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local" url="none"/>
- <workdirectory>_WORK_</workdirectory>
- </pool>
-</config>
Copied: branches/release-0.93.1/tests/sites/ibicluster/sites.template.xml (from rev 5504, branches/release-0.93/tests/sites/ibicluster/sites.template.xml)
===================================================================
--- branches/release-0.93.1/tests/sites/ibicluster/sites.template.xml (rev 0)
+++ branches/release-0.93.1/tests/sites/ibicluster/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,14 @@
+<config>
+ <pool handle="ibicluster">
+ <execution provider="coaster" url="none" jobmanager="local:sge"/>
+ <profile namespace="globus" key="pe">threaded</profile>
+ <profile namespace="globus" key="queue">all.q</profile>
+ <profile namespace="globus" key="jobsPerNode">8</profile>
+ <profile namespace="globus" key="nodeGranularity">1</profile>
+ <profile namespace="globus" key="maxnodes">2</profile>
+ <profile namespace="karajan" key="jobThrottle">0.159</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <filesystem provider="local" url="none"/>
+ <workdirectory>_WORK_</workdirectory>
+ </pool>
+</config>
Deleted: branches/release-0.93.1/tests/sites/ibicluster/tc.template.data
===================================================================
--- branches/release-0.93/tests/sites/ibicluster/tc.template.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ibicluster/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,8 +0,0 @@
-ibicluster echo /bin/echo INSTALLED INTEL32::LINUX
-ibicluster cat /bin/cat INSTALLED INTEL32::LINUX
-ibicluster ls /bin/ls INSTALLED INTEL32::LINUX
-ibicluster grep /bin/grep INSTALLED INTEL32::LINUX
-ibicluster sort /bin/sort INSTALLED INTEL32::LINUX
-ibicluster paste /bin/paste INSTALLED INTEL32::LINUX
-ibicluster wc /usr/bin/wc INSTALLED INTEL32::LINUX
-
Copied: branches/release-0.93.1/tests/sites/ibicluster/tc.template.data (from rev 5504, branches/release-0.93/tests/sites/ibicluster/tc.template.data)
===================================================================
--- branches/release-0.93.1/tests/sites/ibicluster/tc.template.data (rev 0)
+++ branches/release-0.93.1/tests/sites/ibicluster/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,8 @@
+ibicluster echo /bin/echo INSTALLED INTEL32::LINUX
+ibicluster cat /bin/cat INSTALLED INTEL32::LINUX
+ibicluster ls /bin/ls INSTALLED INTEL32::LINUX
+ibicluster grep /bin/grep INSTALLED INTEL32::LINUX
+ibicluster sort /bin/sort INSTALLED INTEL32::LINUX
+ibicluster paste /bin/paste INSTALLED INTEL32::LINUX
+ibicluster wc /usr/bin/wc INSTALLED INTEL32::LINUX
+
Deleted: branches/release-0.93.1/tests/sites/ibicluster/title.txt
===================================================================
--- branches/release-0.93/tests/sites/ibicluster/title.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ibicluster/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-IBICluster SGE Test
Copied: branches/release-0.93.1/tests/sites/ibicluster/title.txt (from rev 5504, branches/release-0.93/tests/sites/ibicluster/title.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/ibicluster/title.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/ibicluster/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+IBICluster SGE Test
Deleted: branches/release-0.93.1/tests/sites/intrepid/100-cp.check.sh
===================================================================
--- branches/release-0.93/tests/sites/intrepid/100-cp.check.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/intrepid/100-cp.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -x
-
-grep $( uname -m ) 100-cp-output.txt || exit 1
-
-exit 0
Copied: branches/release-0.93.1/tests/sites/intrepid/100-cp.check.sh (from rev 5504, branches/release-0.93/tests/sites/intrepid/100-cp.check.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/intrepid/100-cp.check.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/intrepid/100-cp.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -x
+
+grep $( uname -m ) 100-cp-output.txt || exit 1
+
+exit 0
Deleted: branches/release-0.93.1/tests/sites/intrepid/100-cp.clean.sh
===================================================================
--- branches/release-0.93/tests/sites/intrepid/100-cp.clean.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/intrepid/100-cp.clean.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -x
-
-rm -v 100-cp-input.txt 100-cp-output.txt || exit 1
-
-exit 0
Copied: branches/release-0.93.1/tests/sites/intrepid/100-cp.clean.sh (from rev 5504, branches/release-0.93/tests/sites/intrepid/100-cp.clean.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/intrepid/100-cp.clean.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/intrepid/100-cp.clean.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -x
+
+rm -v 100-cp-input.txt 100-cp-output.txt || exit 1
+
+exit 0
Deleted: branches/release-0.93.1/tests/sites/intrepid/100-cp.setup.sh
===================================================================
--- branches/release-0.93/tests/sites/intrepid/100-cp.setup.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/intrepid/100-cp.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -x
-
-uname -a > 100-cp-input.txt || exit 1
-
-exit 0
Copied: branches/release-0.93.1/tests/sites/intrepid/100-cp.setup.sh (from rev 5504, branches/release-0.93/tests/sites/intrepid/100-cp.setup.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/intrepid/100-cp.setup.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/intrepid/100-cp.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -x
+
+uname -a > 100-cp-input.txt || exit 1
+
+exit 0
Deleted: branches/release-0.93.1/tests/sites/intrepid/100-cp.swift
===================================================================
--- branches/release-0.93/tests/sites/intrepid/100-cp.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/intrepid/100-cp.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,13 +0,0 @@
-
-type file;
-
-app (file o) cp(file i)
-{
- cp @i @o;
-}
-
-file input<"100-cp-input.txt">;
-file output<"100-cp-output.txt">;
-
-output = cp(input);
-
Copied: branches/release-0.93.1/tests/sites/intrepid/100-cp.swift (from rev 5504, branches/release-0.93/tests/sites/intrepid/100-cp.swift)
===================================================================
--- branches/release-0.93.1/tests/sites/intrepid/100-cp.swift (rev 0)
+++ branches/release-0.93.1/tests/sites/intrepid/100-cp.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,13 @@
+
+type file;
+
+app (file o) cp(file i)
+{
+ cp @i @o;
+}
+
+file input<"100-cp-input.txt">;
+file output<"100-cp-output.txt">;
+
+output = cp(input);
+
Deleted: branches/release-0.93.1/tests/sites/intrepid/100-cp.timeout
===================================================================
--- branches/release-0.93/tests/sites/intrepid/100-cp.timeout 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/intrepid/100-cp.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-3000
Copied: branches/release-0.93.1/tests/sites/intrepid/100-cp.timeout (from rev 5504, branches/release-0.93/tests/sites/intrepid/100-cp.timeout)
===================================================================
--- branches/release-0.93.1/tests/sites/intrepid/100-cp.timeout (rev 0)
+++ branches/release-0.93.1/tests/sites/intrepid/100-cp.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+3000
Deleted: branches/release-0.93.1/tests/sites/intrepid/sites.template.xml
===================================================================
--- branches/release-0.93/tests/sites/intrepid/sites.template.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/intrepid/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,32 +0,0 @@
-<config>
-
- <pool handle="localhost" sysinfo="INTEL32::LINUX">
- <gridftp url="local://localhost" />
- <execution provider="local" url="none" />
- <workdirectory>/scratch/wozniak/work</workdirectory>
- <!-- <profile namespace="karajan" key="maxSubmitRate">1</profile> -->
- <profile namespace="karajan" key="jobThrottle">0.04</profile>
- <profile namespace="swift" key="stagingMethod">file</profile>
- </pool>
-
- <pool handle="coasters_alcfbgp">
- <filesystem provider="local" />
- <execution provider="coaster" jobmanager="local:cobalt"/>
- <!-- <profile namespace="swift" key="stagingMethod">local</profile> -->
- <profile namespace="globus" key="internalHostname">_HOST_</profile>
- <profile namespace="globus" key="project">_PROJECT_</profile>
- <profile namespace="globus" key="queue">_QUEUE_</profile>
- <profile namespace="globus" key="kernelprofile">zeptoos</profile>
- <profile namespace="globus" key="alcfbgpnat">true</profile>
- <profile namespace="karajan" key="jobthrottle">21</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <profile namespace="globus" key="jobsPerNode">1</profile>
- <profile namespace="globus" key="workerLoggingLevel">DEBUG</profile>
- <profile namespace="globus" key="slots">1</profile>
- <profile namespace="globus" key="maxTime">900</profile> <!-- seconds -->
- <profile namespace="globus" key="nodeGranularity">64</profile>
- <profile namespace="globus" key="maxNodes">64</profile>
- <workdirectory>_WORK_</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites/intrepid/sites.template.xml (from rev 5504, branches/release-0.93/tests/sites/intrepid/sites.template.xml)
===================================================================
--- branches/release-0.93.1/tests/sites/intrepid/sites.template.xml (rev 0)
+++ branches/release-0.93.1/tests/sites/intrepid/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,32 @@
+<config>
+
+ <pool handle="localhost" sysinfo="INTEL32::LINUX">
+ <gridftp url="local://localhost" />
+ <execution provider="local" url="none" />
+ <workdirectory>/scratch/wozniak/work</workdirectory>
+ <!-- <profile namespace="karajan" key="maxSubmitRate">1</profile> -->
+ <profile namespace="karajan" key="jobThrottle">0.04</profile>
+ <profile namespace="swift" key="stagingMethod">file</profile>
+ </pool>
+
+ <pool handle="coasters_alcfbgp">
+ <filesystem provider="local" />
+ <execution provider="coaster" jobmanager="local:cobalt"/>
+ <!-- <profile namespace="swift" key="stagingMethod">local</profile> -->
+ <profile namespace="globus" key="internalHostname">_HOST_</profile>
+ <profile namespace="globus" key="project">_PROJECT_</profile>
+ <profile namespace="globus" key="queue">_QUEUE_</profile>
+ <profile namespace="globus" key="kernelprofile">zeptoos</profile>
+ <profile namespace="globus" key="alcfbgpnat">true</profile>
+ <profile namespace="karajan" key="jobthrottle">21</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <profile namespace="globus" key="jobsPerNode">1</profile>
+ <profile namespace="globus" key="workerLoggingLevel">DEBUG</profile>
+ <profile namespace="globus" key="slots">1</profile>
+ <profile namespace="globus" key="maxTime">900</profile> <!-- seconds -->
+ <profile namespace="globus" key="nodeGranularity">64</profile>
+ <profile namespace="globus" key="maxNodes">64</profile>
+ <workdirectory>_WORK_</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites/intrepid/tc.template.data
===================================================================
--- branches/release-0.93/tests/sites/intrepid/tc.template.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/intrepid/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-coasters_alcfbgp cp /bin/cp INSTALLED INTEL32::LINUX null
Copied: branches/release-0.93.1/tests/sites/intrepid/tc.template.data (from rev 5504, branches/release-0.93/tests/sites/intrepid/tc.template.data)
===================================================================
--- branches/release-0.93.1/tests/sites/intrepid/tc.template.data (rev 0)
+++ branches/release-0.93.1/tests/sites/intrepid/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+coasters_alcfbgp cp /bin/cp INSTALLED INTEL32::LINUX null
Deleted: branches/release-0.93.1/tests/sites/intrepid/title.txt
===================================================================
--- branches/release-0.93/tests/sites/intrepid/title.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/intrepid/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Site Test: BG/P: Intrepid
Copied: branches/release-0.93.1/tests/sites/intrepid/title.txt (from rev 5504, branches/release-0.93/tests/sites/intrepid/title.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/intrepid/title.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/intrepid/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Site Test: BG/P: Intrepid
Deleted: branches/release-0.93.1/tests/sites/local/001-catsn-local.check.sh
===================================================================
--- branches/release-0.93/tests/sites/local/001-catsn-local.check.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local/001-catsn-local.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -x
-
-for count in `seq --format "%04.f" 1 1 10`
-do
- [ -f catsn.$count.out ] || exit 1
- CONTENTS1=$( cat catsn.$count.out.expected )
- CONTENTS2=$( cat catsn.$count.out )
- [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1
-done
-exit 0
Copied: branches/release-0.93.1/tests/sites/local/001-catsn-local.check.sh (from rev 5504, branches/release-0.93/tests/sites/local/001-catsn-local.check.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/local/001-catsn-local.check.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/local/001-catsn-local.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -x
+
+for count in `seq --format "%04.f" 1 1 10`
+do
+ [ -f catsn.$count.out ] || exit 1
+ CONTENTS1=$( cat catsn.$count.out.expected )
+ CONTENTS2=$( cat catsn.$count.out )
+ [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1
+done
+exit 0
Deleted: branches/release-0.93.1/tests/sites/local/001-catsn-local.setup.sh
===================================================================
--- branches/release-0.93/tests/sites/local/001-catsn-local.setup.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local/001-catsn-local.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cp -v $GROUP/data.txt . || exit 1
-cp -v $GROUP/*expected . || exit 1
Copied: branches/release-0.93.1/tests/sites/local/001-catsn-local.setup.sh (from rev 5504, branches/release-0.93/tests/sites/local/001-catsn-local.setup.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/local/001-catsn-local.setup.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/local/001-catsn-local.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cp -v $GROUP/data.txt . || exit 1
+cp -v $GROUP/*expected . || exit 1
Deleted: branches/release-0.93.1/tests/sites/local/001-catsn-local.swift
===================================================================
--- branches/release-0.93/tests/sites/local/001-catsn-local.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local/001-catsn-local.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,15 +0,0 @@
-type file;
-
-app (file o) cat (file i)
-{
- cat @i stdout=@o;
-}
-
-string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-string char[] = @strsplit(t, "");
-
-file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
-foreach j in [1:@toint(@arg("n","10"))] {
- file data<"data.txt">;
- out[j] = cat(data);
-}
Copied: branches/release-0.93.1/tests/sites/local/001-catsn-local.swift (from rev 5504, branches/release-0.93/tests/sites/local/001-catsn-local.swift)
===================================================================
--- branches/release-0.93.1/tests/sites/local/001-catsn-local.swift (rev 0)
+++ branches/release-0.93.1/tests/sites/local/001-catsn-local.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,15 @@
+type file;
+
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
+
+string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+string char[] = @strsplit(t, "");
+
+file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
+foreach j in [1:@toint(@arg("n","10"))] {
+ file data<"data.txt">;
+ out[j] = cat(data);
+}
Deleted: branches/release-0.93.1/tests/sites/local/001-catsn-local.timeout
===================================================================
--- branches/release-0.93/tests/sites/local/001-catsn-local.timeout 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local/001-catsn-local.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-30
Copied: branches/release-0.93.1/tests/sites/local/001-catsn-local.timeout (from rev 5504, branches/release-0.93/tests/sites/local/001-catsn-local.timeout)
===================================================================
--- branches/release-0.93.1/tests/sites/local/001-catsn-local.timeout (rev 0)
+++ branches/release-0.93.1/tests/sites/local/001-catsn-local.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+30
Deleted: branches/release-0.93.1/tests/sites/local/catsn.0001.out.expected
===================================================================
--- branches/release-0.93/tests/sites/local/catsn.0001.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/local/catsn.0001.out.expected (from rev 5504, branches/release-0.93/tests/sites/local/catsn.0001.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/local/catsn.0001.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/local/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/local/catsn.0002.out.expected
===================================================================
--- branches/release-0.93/tests/sites/local/catsn.0002.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/local/catsn.0002.out.expected (from rev 5504, branches/release-0.93/tests/sites/local/catsn.0002.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/local/catsn.0002.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/local/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/local/catsn.0003.out.expected
===================================================================
--- branches/release-0.93/tests/sites/local/catsn.0003.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/local/catsn.0003.out.expected (from rev 5504, branches/release-0.93/tests/sites/local/catsn.0003.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/local/catsn.0003.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/local/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/local/catsn.0004.out.expected
===================================================================
--- branches/release-0.93/tests/sites/local/catsn.0004.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/local/catsn.0004.out.expected (from rev 5504, branches/release-0.93/tests/sites/local/catsn.0004.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/local/catsn.0004.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/local/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/local/catsn.0005.out.expected
===================================================================
--- branches/release-0.93/tests/sites/local/catsn.0005.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/local/catsn.0005.out.expected (from rev 5504, branches/release-0.93/tests/sites/local/catsn.0005.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/local/catsn.0005.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/local/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/local/catsn.0006.out.expected
===================================================================
--- branches/release-0.93/tests/sites/local/catsn.0006.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/local/catsn.0006.out.expected (from rev 5504, branches/release-0.93/tests/sites/local/catsn.0006.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/local/catsn.0006.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/local/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/local/catsn.0007.out.expected
===================================================================
--- branches/release-0.93/tests/sites/local/catsn.0007.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/local/catsn.0007.out.expected (from rev 5504, branches/release-0.93/tests/sites/local/catsn.0007.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/local/catsn.0007.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/local/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/local/catsn.0008.out.expected
===================================================================
--- branches/release-0.93/tests/sites/local/catsn.0008.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/local/catsn.0008.out.expected (from rev 5504, branches/release-0.93/tests/sites/local/catsn.0008.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/local/catsn.0008.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/local/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/local/catsn.0009.out.expected
===================================================================
--- branches/release-0.93/tests/sites/local/catsn.0009.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/local/catsn.0009.out.expected (from rev 5504, branches/release-0.93/tests/sites/local/catsn.0009.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/local/catsn.0009.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/local/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/local/catsn.0010.out.expected
===================================================================
--- branches/release-0.93/tests/sites/local/catsn.0010.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/local/catsn.0010.out.expected (from rev 5504, branches/release-0.93/tests/sites/local/catsn.0010.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/local/catsn.0010.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/local/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/local/data.txt
===================================================================
--- branches/release-0.93/tests/sites/local/data.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/local/data.txt (from rev 5504, branches/release-0.93/tests/sites/local/data.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/local/data.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/local/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/local/sites.template.xml
===================================================================
--- branches/release-0.93/tests/sites/local/sites.template.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-<pool handle="localhost">
- <execution provider="local" />
- <gridftp url="local://localhost" />
- <profile key="initialScore" namespace="karajan">10000</profile>
- <profile key="jobThrottle" namespace="karajan">.31</profile>
- <workdirectory>_WORK_</workdirectory>
-</pool>
-</config>
Copied: branches/release-0.93.1/tests/sites/local/sites.template.xml (from rev 5504, branches/release-0.93/tests/sites/local/sites.template.xml)
===================================================================
--- branches/release-0.93.1/tests/sites/local/sites.template.xml (rev 0)
+++ branches/release-0.93.1/tests/sites/local/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+<pool handle="localhost">
+ <execution provider="local" />
+ <gridftp url="local://localhost" />
+ <profile key="initialScore" namespace="karajan">10000</profile>
+ <profile key="jobThrottle" namespace="karajan">.31</profile>
+ <workdirectory>_WORK_</workdirectory>
+</pool>
+</config>
Deleted: branches/release-0.93.1/tests/sites/local/tc.template.data
===================================================================
--- branches/release-0.93/tests/sites/local/tc.template.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,8 +0,0 @@
-localhost echo /bin/echo INSTALLED INTEL32::LINUX
-localhost cat /bin/cat INSTALLED INTEL32::LINUX
-localhost ls /bin/ls INSTALLED INTEL32::LINUX
-localhost grep /bin/grep INSTALLED INTEL32::LINUX
-localhost sort /bin/sort INSTALLED INTEL32::LINUX
-localhost paste /bin/paste INSTALLED INTEL32::LINUX
-localhost wc /usr/bin/wc INSTALLED INTEL32::LINUX
-
Copied: branches/release-0.93.1/tests/sites/local/tc.template.data (from rev 5504, branches/release-0.93/tests/sites/local/tc.template.data)
===================================================================
--- branches/release-0.93.1/tests/sites/local/tc.template.data (rev 0)
+++ branches/release-0.93.1/tests/sites/local/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,8 @@
+localhost echo /bin/echo INSTALLED INTEL32::LINUX
+localhost cat /bin/cat INSTALLED INTEL32::LINUX
+localhost ls /bin/ls INSTALLED INTEL32::LINUX
+localhost grep /bin/grep INSTALLED INTEL32::LINUX
+localhost sort /bin/sort INSTALLED INTEL32::LINUX
+localhost paste /bin/paste INSTALLED INTEL32::LINUX
+localhost wc /usr/bin/wc INSTALLED INTEL32::LINUX
+
Deleted: branches/release-0.93.1/tests/sites/local/title.txt
===================================================================
--- branches/release-0.93/tests/sites/local/title.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Local Configuration Test
Copied: branches/release-0.93.1/tests/sites/local/title.txt (from rev 5504, branches/release-0.93/tests/sites/local/title.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/local/title.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/local/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Local Configuration Test
Property changes on: branches/release-0.93.1/tests/sites/local-coasters
___________________________________________________________________
Added: svn:ignore
+ 200-input.txt
Deleted: branches/release-0.93.1/tests/sites/local-coasters/200-cp.check.sh
===================================================================
--- branches/release-0.93/tests/sites/local-coasters/200-cp.check.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local-coasters/200-cp.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -x
-
-grep $( uname -m ) 200-input.txt || exit 1
-grep $( uname -m ) 200-output.txt || exit 1
-
-exit 0
Copied: branches/release-0.93.1/tests/sites/local-coasters/200-cp.check.sh (from rev 5504, branches/release-0.93/tests/sites/local-coasters/200-cp.check.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/local-coasters/200-cp.check.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/local-coasters/200-cp.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -x
+
+grep $( uname -m ) 200-input.txt || exit 1
+grep $( uname -m ) 200-output.txt || exit 1
+
+exit 0
Deleted: branches/release-0.93.1/tests/sites/local-coasters/200-cp.clean.sh
===================================================================
--- branches/release-0.93/tests/sites/local-coasters/200-cp.clean.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local-coasters/200-cp.clean.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -x
-
-rm -rv 200-output.txt || exit 1
-
-exit 0
Copied: branches/release-0.93.1/tests/sites/local-coasters/200-cp.clean.sh (from rev 5504, branches/release-0.93/tests/sites/local-coasters/200-cp.clean.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/local-coasters/200-cp.clean.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/local-coasters/200-cp.clean.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -x
+
+rm -rv 200-output.txt || exit 1
+
+exit 0
Deleted: branches/release-0.93.1/tests/sites/local-coasters/200-cp.setup.sh
===================================================================
--- branches/release-0.93/tests/sites/local-coasters/200-cp.setup.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local-coasters/200-cp.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -x
-
-{
- uname -a
- date
-} > 200-input.txt
-
-exit 0
Copied: branches/release-0.93.1/tests/sites/local-coasters/200-cp.setup.sh (from rev 5504, branches/release-0.93/tests/sites/local-coasters/200-cp.setup.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/local-coasters/200-cp.setup.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/local-coasters/200-cp.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -x
+
+{
+ uname -a
+ date
+} > 200-input.txt
+
+exit 0
Deleted: branches/release-0.93.1/tests/sites/local-coasters/200-cp.swift
===================================================================
--- branches/release-0.93/tests/sites/local-coasters/200-cp.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local-coasters/200-cp.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,10 +0,0 @@
-
-type file;
-
-app (file o) cp(file i)
-{
- cp @i @o;
-}
-
-file input<"200-input.txt">;
-file output<"200-output.txt"> = cp(input);
Copied: branches/release-0.93.1/tests/sites/local-coasters/200-cp.swift (from rev 5504, branches/release-0.93/tests/sites/local-coasters/200-cp.swift)
===================================================================
--- branches/release-0.93.1/tests/sites/local-coasters/200-cp.swift (rev 0)
+++ branches/release-0.93.1/tests/sites/local-coasters/200-cp.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,10 @@
+
+type file;
+
+app (file o) cp(file i)
+{
+ cp @i @o;
+}
+
+file input<"200-input.txt">;
+file output<"200-output.txt"> = cp(input);
Deleted: branches/release-0.93.1/tests/sites/local-coasters/201-cp.check.sh
===================================================================
--- branches/release-0.93/tests/sites/local-coasters/201-cp.check.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local-coasters/201-cp.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -x
-
-COUNT=$( ls 201-output* | wc -l )
-
-[[ $COUNT == 40 ]] || exit 1
-
-exit 0
Copied: branches/release-0.93.1/tests/sites/local-coasters/201-cp.check.sh (from rev 5504, branches/release-0.93/tests/sites/local-coasters/201-cp.check.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/local-coasters/201-cp.check.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/local-coasters/201-cp.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -x
+
+COUNT=$( ls 201-output* | wc -l )
+
+[[ $COUNT == 40 ]] || exit 1
+
+exit 0
Deleted: branches/release-0.93.1/tests/sites/local-coasters/201-cp.clean.sh
===================================================================
--- branches/release-0.93/tests/sites/local-coasters/201-cp.clean.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local-coasters/201-cp.clean.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -x
-
-rm -rv 201-output-[12]-*.txt || exit 1
-
-exit 0
Copied: branches/release-0.93.1/tests/sites/local-coasters/201-cp.clean.sh (from rev 5504, branches/release-0.93/tests/sites/local-coasters/201-cp.clean.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/local-coasters/201-cp.clean.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/local-coasters/201-cp.clean.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -x
+
+rm -rv 201-output-[12]-*.txt || exit 1
+
+exit 0
Deleted: branches/release-0.93.1/tests/sites/local-coasters/201-cp.setup.sh
===================================================================
--- branches/release-0.93/tests/sites/local-coasters/201-cp.setup.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local-coasters/201-cp.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -x
-
-{
- uname -a
- date
-} > 201-input-1.txt
-
-cp -v 201-input-1.txt 201-input-2.txt
-
-exit 0
Copied: branches/release-0.93.1/tests/sites/local-coasters/201-cp.setup.sh (from rev 5504, branches/release-0.93/tests/sites/local-coasters/201-cp.setup.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/local-coasters/201-cp.setup.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/local-coasters/201-cp.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -x
+
+{
+ uname -a
+ date
+} > 201-input-1.txt
+
+cp -v 201-input-1.txt 201-input-2.txt
+
+exit 0
Deleted: branches/release-0.93.1/tests/sites/local-coasters/201-cp.swift
===================================================================
--- branches/release-0.93/tests/sites/local-coasters/201-cp.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local-coasters/201-cp.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,24 +0,0 @@
-
-type file;
-
-app (file o) cp(file i)
-{
- cp @i @o;
-}
-
-file input1<"201-input-1.txt">;
-file input2<"201-input-2.txt">;
-
-foreach i in [1:20]
-{
- string s = @strcat("201-output-1-", i, ".txt");
- file output<single_file_mapper;file=s>;
- output = cp(input1);
-}
-
-foreach j in [1:20]
-{
- string s = @strcat("201-output-2-", j, ".txt");
- file output<single_file_mapper;file=s>;
- output = cp(input2);
-}
Copied: branches/release-0.93.1/tests/sites/local-coasters/201-cp.swift (from rev 5504, branches/release-0.93/tests/sites/local-coasters/201-cp.swift)
===================================================================
--- branches/release-0.93.1/tests/sites/local-coasters/201-cp.swift (rev 0)
+++ branches/release-0.93.1/tests/sites/local-coasters/201-cp.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,24 @@
+
+type file;
+
+app (file o) cp(file i)
+{
+ cp @i @o;
+}
+
+file input1<"201-input-1.txt">;
+file input2<"201-input-2.txt">;
+
+foreach i in [1:20]
+{
+ string s = @strcat("201-output-1-", i, ".txt");
+ file output<single_file_mapper;file=s>;
+ output = cp(input1);
+}
+
+foreach j in [1:20]
+{
+ string s = @strcat("201-output-2-", j, ".txt");
+ file output<single_file_mapper;file=s>;
+ output = cp(input2);
+}
Deleted: branches/release-0.93.1/tests/sites/local-coasters/README.txt
===================================================================
--- branches/release-0.93/tests/sites/local-coasters/README.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local-coasters/README.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,5 +0,0 @@
-
-Tests for basic Coasters functionality on local machine
-
-200 series: Simple jobs, simple settings
-
Copied: branches/release-0.93.1/tests/sites/local-coasters/README.txt (from rev 5504, branches/release-0.93/tests/sites/local-coasters/README.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/local-coasters/README.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/local-coasters/README.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,5 @@
+
+Tests for basic Coasters functionality on local machine
+
+200 series: Simple jobs, simple settings
+
Deleted: branches/release-0.93.1/tests/sites/local-coasters/sites.template.xml
===================================================================
--- branches/release-0.93/tests/sites/local-coasters/sites.template.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local-coasters/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,24 +0,0 @@
-<config>
-
- <pool handle="localhost" sysinfo="INTEL32::LINUX">
- <gridftp url="local://localhost" />
- <execution provider="local" url="none" />
- <workdirectory>_WORK_</workdirectory>
- <profile namespace="swift" key="stagingMethod">file</profile>
- </pool>
-
- <pool handle="coasterslocal">
- <filesystem provider="local" />
- <execution provider="coaster" jobmanager="local:local"/>
- <profile namespace="globus" key="internalHostname">_HOST_</profile>
- <profile namespace="karajan" key="jobthrottle">2.55</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <profile namespace="globus" key="jobsPerNode">4</profile>
- <profile namespace="globus" key="slots">8</profile>
- <profile namespace="globus" key="maxTime">1000</profile>
- <profile namespace="globus" key="nodeGranularity">1</profile>
- <profile namespace="globus" key="maxNodes">4</profile>
- <workdirectory>_WORK_</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites/local-coasters/sites.template.xml (from rev 5504, branches/release-0.93/tests/sites/local-coasters/sites.template.xml)
===================================================================
--- branches/release-0.93.1/tests/sites/local-coasters/sites.template.xml (rev 0)
+++ branches/release-0.93.1/tests/sites/local-coasters/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,24 @@
+<config>
+
+ <pool handle="localhost" sysinfo="INTEL32::LINUX">
+ <gridftp url="local://localhost" />
+ <execution provider="local" url="none" />
+ <workdirectory>_WORK_</workdirectory>
+ <profile namespace="swift" key="stagingMethod">file</profile>
+ </pool>
+
+ <pool handle="coasterslocal">
+ <filesystem provider="local" />
+ <execution provider="coaster" jobmanager="local:local"/>
+ <profile namespace="globus" key="internalHostname">_HOST_</profile>
+ <profile namespace="karajan" key="jobthrottle">2.55</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <profile namespace="globus" key="jobsPerNode">4</profile>
+ <profile namespace="globus" key="slots">8</profile>
+ <profile namespace="globus" key="maxTime">1000</profile>
+ <profile namespace="globus" key="nodeGranularity">1</profile>
+ <profile namespace="globus" key="maxNodes">4</profile>
+ <workdirectory>_WORK_</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites/local-coasters/tc.template.data
===================================================================
--- branches/release-0.93/tests/sites/local-coasters/tc.template.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local-coasters/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,19 +0,0 @@
-#This is the transformation catalog.
-#
-#It comes pre-configured with a number of simple transformations with
-#paths that are likely to work on a linux box. However, on some systems,
-#the paths to these executables will be different (for example, sometimes
-#some of these programs are found in /usr/bin rather than in /bin)
-#
-#NOTE WELL: fields in this file must be separated by tabs, not spaces; and
-#there must be no trailing whitespace at the end of each line.
-#
-# sitename transformation path INSTALLED platform profiles
-localhost echo /bin/echo INSTALLED INTEL32::LINUX null
-localhost cat /bin/cat INSTALLED INTEL32::LINUX null
-localhost ls /bin/ls INSTALLED INTEL32::LINUX null
-localhost grep /bin/grep INSTALLED INTEL32::LINUX null
-localhost sort /bin/sort INSTALLED INTEL32::LINUX null
-localhost paste /bin/paste INSTALLED INTEL32::LINUX null
-
-coasterslocal cp /bin/cp INSTALLED INTEL32::LINUX null
Copied: branches/release-0.93.1/tests/sites/local-coasters/tc.template.data (from rev 5504, branches/release-0.93/tests/sites/local-coasters/tc.template.data)
===================================================================
--- branches/release-0.93.1/tests/sites/local-coasters/tc.template.data (rev 0)
+++ branches/release-0.93.1/tests/sites/local-coasters/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,19 @@
+#This is the transformation catalog.
+#
+#It comes pre-configured with a number of simple transformations with
+#paths that are likely to work on a linux box. However, on some systems,
+#the paths to these executables will be different (for example, sometimes
+#some of these programs are found in /usr/bin rather than in /bin)
+#
+#NOTE WELL: fields in this file must be separated by tabs, not spaces; and
+#there must be no trailing whitespace at the end of each line.
+#
+# sitename transformation path INSTALLED platform profiles
+localhost echo /bin/echo INSTALLED INTEL32::LINUX null
+localhost cat /bin/cat INSTALLED INTEL32::LINUX null
+localhost ls /bin/ls INSTALLED INTEL32::LINUX null
+localhost grep /bin/grep INSTALLED INTEL32::LINUX null
+localhost sort /bin/sort INSTALLED INTEL32::LINUX null
+localhost paste /bin/paste INSTALLED INTEL32::LINUX null
+
+coasterslocal cp /bin/cp INSTALLED INTEL32::LINUX null
Deleted: branches/release-0.93.1/tests/sites/local-coasters/title.txt
===================================================================
--- branches/release-0.93/tests/sites/local-coasters/title.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/local-coasters/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Local coasters
Copied: branches/release-0.93.1/tests/sites/local-coasters/title.txt (from rev 5504, branches/release-0.93/tests/sites/local-coasters/title.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/local-coasters/title.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/local-coasters/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Local coasters
Deleted: branches/release-0.93.1/tests/sites/mcs/001-catsn.check.sh
===================================================================
--- branches/release-0.93/tests/sites/mcs/001-catsn.check.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/001-catsn.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -x
-
-for count in `seq --format "%04.f" 1 1 10`
-do
- [ -f catsn.$count.out ] || exit 1
- CONTENTS1=$( cat catsn.$count.out.expected )
- CONTENTS2=$( cat catsn.$count.out )
- [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1
-done
-exit 0
Copied: branches/release-0.93.1/tests/sites/mcs/001-catsn.check.sh (from rev 5504, branches/release-0.93/tests/sites/mcs/001-catsn.check.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/001-catsn.check.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/001-catsn.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -x
+
+for count in `seq --format "%04.f" 1 1 10`
+do
+ [ -f catsn.$count.out ] || exit 1
+ CONTENTS1=$( cat catsn.$count.out.expected )
+ CONTENTS2=$( cat catsn.$count.out )
+ [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1
+done
+exit 0
Deleted: branches/release-0.93.1/tests/sites/mcs/001-catsn.clean.sh
===================================================================
--- branches/release-0.93/tests/sites/mcs/001-catsn.clean.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/001-catsn.clean.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-stop-coaster-service
Copied: branches/release-0.93.1/tests/sites/mcs/001-catsn.clean.sh (from rev 5504, branches/release-0.93/tests/sites/mcs/001-catsn.clean.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/001-catsn.clean.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/001-catsn.clean.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+stop-coaster-service
Deleted: branches/release-0.93.1/tests/sites/mcs/001-catsn.setup.sh
===================================================================
--- branches/release-0.93/tests/sites/mcs/001-catsn.setup.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/001-catsn.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-mkdir -p ~/work
-cp -v $GROUP/data.txt . || exit 1
-cp -v $GROUP/*expected . || exit 1
-export WORK=$HOME/work
-start-coaster-service || exit 1
Copied: branches/release-0.93.1/tests/sites/mcs/001-catsn.setup.sh (from rev 5504, branches/release-0.93/tests/sites/mcs/001-catsn.setup.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/001-catsn.setup.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/001-catsn.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+mkdir -p ~/work
+cp -v $GROUP/data.txt . || exit 1
+cp -v $GROUP/*expected . || exit 1
+export WORK=$HOME/work
+start-coaster-service || exit 1
Deleted: branches/release-0.93.1/tests/sites/mcs/001-catsn.swift
===================================================================
--- branches/release-0.93/tests/sites/mcs/001-catsn.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/001-catsn.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,12 +0,0 @@
-type file;
-
-app (file o) cat (file i)
-{
- cat @i stdout=@o;
-}
-
-file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
-foreach j in [1:@toint(@arg("n","10"))] {
- file data<"data.txt">;
- out[j] = cat(data);
-}
Copied: branches/release-0.93.1/tests/sites/mcs/001-catsn.swift (from rev 5504, branches/release-0.93/tests/sites/mcs/001-catsn.swift)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/001-catsn.swift (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/001-catsn.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,12 @@
+type file;
+
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
+
+file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
+foreach j in [1:@toint(@arg("n","10"))] {
+ file data<"data.txt">;
+ out[j] = cat(data);
+}
Deleted: branches/release-0.93.1/tests/sites/mcs/001-catsn.timeout
===================================================================
--- branches/release-0.93/tests/sites/mcs/001-catsn.timeout 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/001-catsn.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-180
Copied: branches/release-0.93.1/tests/sites/mcs/001-catsn.timeout (from rev 5504, branches/release-0.93/tests/sites/mcs/001-catsn.timeout)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/001-catsn.timeout (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/001-catsn.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+180
Deleted: branches/release-0.93.1/tests/sites/mcs/README
===================================================================
--- branches/release-0.93/tests/sites/mcs/README 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/README 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,58 +0,0 @@
-Before running this test, be sure to copy coaster-service.conf to your swift etc directory
-
-There are no templates in this directory. start-coaster-service generates sites.xml from the persistent-coasters template
-
-Be sure that you have all the hosts properly configured in ~/.ssh/auth.defaults. You can use the example below as a template.
-
-crush.mcs.anl.gov.type=key
-crush.mcs.anl.gov.username=davidk
-crush.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
-crush.mcs.anl.gov.passphrase=your passphrase here
-
-thwomp.mcs.anl.gov.type=key
-thwomp.mcs.anl.gov.username=davidk
-thwomp.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
-thwomp.mcs.anl.gov.passphrase=your passphrase here
-
-stomp.mcs.anl.gov.type=key
-stomp.mcs.anl.gov.username=davidk
-stomp.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
-stomp.mcs.anl.gov.passphrase=your passphrase here
-
-crank.mcs.anl.gov.type=key
-crank.mcs.anl.gov.username=davidk
-crank.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
-crank.mcs.anl.gov.passphrase=your passphrase here
-
-steamroller.mcs.anl.gov.type=key
-steamroller.mcs.anl.gov.username=davidk
-steamroller.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
-steamroller.mcs.anl.gov.passphrase=your passphrase here
-
-grind.mcs.anl.gov.type=key
-grind.mcs.anl.gov.username=davidk
-grind.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
-grind.mcs.anl.gov.passphrase=your passphrase here
-
-churn.mcs.anl.gov.type=key
-churn.mcs.anl.gov.username=davidk
-churn.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
-churn.mcs.anl.gov.passphrase=your passphrase here
-
-trounce.mcs.anl.gov.type=key
-trounce.mcs.anl.gov.username=davidk
-trounce.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
-trounce.mcs.anl.gov.passphrase=your passphrase here
-
-thrash.mcs.anl.gov.type=key
-thrash.mcs.anl.gov.username=davidk
-thrash.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
-thrash.mcs.anl.gov.passphrase=your passphrase here
-
-vanquish.mcs.anl.gov.type=key
-vanquish.mcs.anl.gov.username=davidk
-vanquish.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
-vanquish.mcs.anl.gov.passphrase=your passphrase here
-
-
-
Copied: branches/release-0.93.1/tests/sites/mcs/README (from rev 5504, branches/release-0.93/tests/sites/mcs/README)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/README (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/README 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,58 @@
+Before running this test, be sure to copy coaster-service.conf to your swift etc directory
+
+There are no templates in this directory. start-coaster-service generates sites.xml from the persistent-coasters template
+
+Be sure that you have all the hosts properly configured in ~/.ssh/auth.defaults. You can use the example below as a template.
+
+crush.mcs.anl.gov.type=key
+crush.mcs.anl.gov.username=davidk
+crush.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+crush.mcs.anl.gov.passphrase=your passphrase here
+
+thwomp.mcs.anl.gov.type=key
+thwomp.mcs.anl.gov.username=davidk
+thwomp.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+thwomp.mcs.anl.gov.passphrase=your passphrase here
+
+stomp.mcs.anl.gov.type=key
+stomp.mcs.anl.gov.username=davidk
+stomp.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+stomp.mcs.anl.gov.passphrase=your passphrase here
+
+crank.mcs.anl.gov.type=key
+crank.mcs.anl.gov.username=davidk
+crank.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+crank.mcs.anl.gov.passphrase=your passphrase here
+
+steamroller.mcs.anl.gov.type=key
+steamroller.mcs.anl.gov.username=davidk
+steamroller.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+steamroller.mcs.anl.gov.passphrase=your passphrase here
+
+grind.mcs.anl.gov.type=key
+grind.mcs.anl.gov.username=davidk
+grind.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+grind.mcs.anl.gov.passphrase=your passphrase here
+
+churn.mcs.anl.gov.type=key
+churn.mcs.anl.gov.username=davidk
+churn.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+churn.mcs.anl.gov.passphrase=your passphrase here
+
+trounce.mcs.anl.gov.type=key
+trounce.mcs.anl.gov.username=davidk
+trounce.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+trounce.mcs.anl.gov.passphrase=your passphrase here
+
+thrash.mcs.anl.gov.type=key
+thrash.mcs.anl.gov.username=davidk
+thrash.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+thrash.mcs.anl.gov.passphrase=your passphrase here
+
+vanquish.mcs.anl.gov.type=key
+vanquish.mcs.anl.gov.username=davidk
+vanquish.mcs.anl.gov.key=/home/davidk/.ssh/id_rsa
+vanquish.mcs.anl.gov.passphrase=your passphrase here
+
+
+
Deleted: branches/release-0.93.1/tests/sites/mcs/catsn.0001.out.expected
===================================================================
--- branches/release-0.93/tests/sites/mcs/catsn.0001.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/mcs/catsn.0001.out.expected (from rev 5504, branches/release-0.93/tests/sites/mcs/catsn.0001.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/catsn.0001.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/mcs/catsn.0002.out.expected
===================================================================
--- branches/release-0.93/tests/sites/mcs/catsn.0002.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/mcs/catsn.0002.out.expected (from rev 5504, branches/release-0.93/tests/sites/mcs/catsn.0002.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/catsn.0002.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/mcs/catsn.0003.out.expected
===================================================================
--- branches/release-0.93/tests/sites/mcs/catsn.0003.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/mcs/catsn.0003.out.expected (from rev 5504, branches/release-0.93/tests/sites/mcs/catsn.0003.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/catsn.0003.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/mcs/catsn.0004.out.expected
===================================================================
--- branches/release-0.93/tests/sites/mcs/catsn.0004.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/mcs/catsn.0004.out.expected (from rev 5504, branches/release-0.93/tests/sites/mcs/catsn.0004.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/catsn.0004.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/mcs/catsn.0005.out.expected
===================================================================
--- branches/release-0.93/tests/sites/mcs/catsn.0005.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/mcs/catsn.0005.out.expected (from rev 5504, branches/release-0.93/tests/sites/mcs/catsn.0005.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/catsn.0005.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/mcs/catsn.0006.out.expected
===================================================================
--- branches/release-0.93/tests/sites/mcs/catsn.0006.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/mcs/catsn.0006.out.expected (from rev 5504, branches/release-0.93/tests/sites/mcs/catsn.0006.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/catsn.0006.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/mcs/catsn.0007.out.expected
===================================================================
--- branches/release-0.93/tests/sites/mcs/catsn.0007.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/mcs/catsn.0007.out.expected (from rev 5504, branches/release-0.93/tests/sites/mcs/catsn.0007.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/catsn.0007.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/mcs/catsn.0008.out.expected
===================================================================
--- branches/release-0.93/tests/sites/mcs/catsn.0008.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/mcs/catsn.0008.out.expected (from rev 5504, branches/release-0.93/tests/sites/mcs/catsn.0008.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/catsn.0008.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/mcs/catsn.0009.out.expected
===================================================================
--- branches/release-0.93/tests/sites/mcs/catsn.0009.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/mcs/catsn.0009.out.expected (from rev 5504, branches/release-0.93/tests/sites/mcs/catsn.0009.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/catsn.0009.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/mcs/catsn.0010.out.expected
===================================================================
--- branches/release-0.93/tests/sites/mcs/catsn.0010.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/mcs/catsn.0010.out.expected (from rev 5504, branches/release-0.93/tests/sites/mcs/catsn.0010.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/catsn.0010.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/mcs/coaster-service.conf
===================================================================
--- branches/release-0.93/tests/sites/mcs/coaster-service.conf 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/coaster-service.conf 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,30 +0,0 @@
-# Keep all interesting settings in one place
-# User should modify this to fit environment
-
-# Location of SWIFT. If empty, PATH is referenced
-export SWIFT=
-
-# Where to place/launch worker.pl on the remote machine for sites.xml
-export WORKER_WORK=/home/${USER}/work
-
-# How to launch workers: local, ssh, or cobalt
-export WORKER_MODE=ssh
-
-# Worker logging setting passed to worker.pl for sites.xml
-export WORKER_LOGGING=INFO
-
-# Worker host names for ssh
-export WORKER_HOSTS="crush.mcs.anl.gov thwomp.mcs.anl.gov stomp.mcs.anl.gov crank.mcs.anl.gov
-steamroller.mcs.anl.gov grind.mcs.anl.gov churn.mcs.anl.gov trounce.mcs.anl.gov
-thrash.mcs.anl.gov vanquish.mcs.anl.gov"
-
-# Directory to keep log files, relative to working directory when launching start-coaster-service
-export LOG_DIR=logs
-
-# Manually define ports. If not specified, ports will be automatically generated
-export LOCAL_PORT=
-export SERVICE_PORT=
-
-# start-coaster-service tries to automatically detect IP address.
-# Specify here if auto detection is not working correctly
-export IPADDR=
Copied: branches/release-0.93.1/tests/sites/mcs/coaster-service.conf (from rev 5504, branches/release-0.93/tests/sites/mcs/coaster-service.conf)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/coaster-service.conf (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/coaster-service.conf 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,30 @@
+# Keep all interesting settings in one place
+# User should modify this to fit environment
+
+# Location of SWIFT. If empty, PATH is referenced
+export SWIFT=
+
+# Where to place/launch worker.pl on the remote machine for sites.xml
+export WORKER_WORK=/home/${USER}/work
+
+# How to launch workers: local, ssh, or cobalt
+export WORKER_MODE=ssh
+
+# Worker logging setting passed to worker.pl for sites.xml
+export WORKER_LOGGING=INFO
+
+# Worker host names for ssh
+export WORKER_HOSTS="crush.mcs.anl.gov thwomp.mcs.anl.gov stomp.mcs.anl.gov crank.mcs.anl.gov
+steamroller.mcs.anl.gov grind.mcs.anl.gov churn.mcs.anl.gov trounce.mcs.anl.gov
+thrash.mcs.anl.gov vanquish.mcs.anl.gov"
+
+# Directory to keep log files, relative to working directory when launching start-coaster-service
+export LOG_DIR=logs
+
+# Manually define ports. If not specified, ports will be automatically generated
+export LOCAL_PORT=
+export SERVICE_PORT=
+
+# start-coaster-service tries to automatically detect IP address.
+# Specify here if auto detection is not working correctly
+export IPADDR=
Deleted: branches/release-0.93.1/tests/sites/mcs/data.txt
===================================================================
--- branches/release-0.93/tests/sites/mcs/data.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/mcs/data.txt (from rev 5504, branches/release-0.93/tests/sites/mcs/data.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/data.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/mcs/title.txt
===================================================================
--- branches/release-0.93/tests/sites/mcs/title.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/mcs/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-MCS Machines with Persistent Coasters and SSH
Copied: branches/release-0.93.1/tests/sites/mcs/title.txt (from rev 5504, branches/release-0.93/tests/sites/mcs/title.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/mcs/title.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/mcs/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+MCS Machines with Persistent Coasters and SSH
Deleted: branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.check.sh
===================================================================
--- branches/release-0.93/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.check.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cp -v $GROUP/data.txt . || exit 1
-cp -v $GROUP/*expected . || exit 1
Copied: branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.check.sh (from rev 5504, branches/release-0.93/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.check.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.check.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cp -v $GROUP/data.txt . || exit 1
+cp -v $GROUP/*expected . || exit 1
Deleted: branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.swift
===================================================================
--- branches/release-0.93/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,15 +0,0 @@
-type file;
-
-app (file o) cat (file i)
-{
- cat @i stdout=@o;
-}
-
-string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-string char[] = @strsplit(t, "");
-
-file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
-foreach j in [1:@toint(@arg("n","10"))] {
- file data<"data.txt">;
- out[j] = cat(data);
-}
Copied: branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.swift (from rev 5504, branches/release-0.93/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.swift)
===================================================================
--- branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.swift (rev 0)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,15 @@
+type file;
+
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
+
+string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+string char[] = @strsplit(t, "");
+
+file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
+foreach j in [1:@toint(@arg("n","10"))] {
+ file data<"data.txt">;
+ out[j] = cat(data);
+}
Deleted: branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.timeout
===================================================================
--- branches/release-0.93/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.timeout 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-180
Copied: branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.timeout (from rev 5504, branches/release-0.93/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.timeout)
===================================================================
--- branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.timeout (rev 0)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/001-catsn-queenbee-pbs.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+180
Deleted: branches/release-0.93.1/tests/sites/queenbee/pbs/README
===================================================================
--- branches/release-0.93/tests/sites/queenbee/pbs/README 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/README 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,2 +0,0 @@
-Queenbee uses an older version of bash which does not work with the nightly.sh by default
-In order to run these tests, download and compile a newer version of bash from ftp.gnu.org/pub/bash
Copied: branches/release-0.93.1/tests/sites/queenbee/pbs/README (from rev 5504, branches/release-0.93/tests/sites/queenbee/pbs/README)
===================================================================
--- branches/release-0.93.1/tests/sites/queenbee/pbs/README (rev 0)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/README 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,2 @@
+Queenbee uses an older version of bash which does not work with the nightly.sh by default
+In order to run these tests, download and compile a newer version of bash from ftp.gnu.org/pub/bash
Deleted: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0001.out.expected
===================================================================
--- branches/release-0.93/tests/sites/queenbee/pbs/catsn.0001.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0001.out.expected (from rev 5504, branches/release-0.93/tests/sites/queenbee/pbs/catsn.0001.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0001.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0002.out.expected
===================================================================
--- branches/release-0.93/tests/sites/queenbee/pbs/catsn.0002.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0002.out.expected (from rev 5504, branches/release-0.93/tests/sites/queenbee/pbs/catsn.0002.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0002.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0003.out.expected
===================================================================
--- branches/release-0.93/tests/sites/queenbee/pbs/catsn.0003.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0003.out.expected (from rev 5504, branches/release-0.93/tests/sites/queenbee/pbs/catsn.0003.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0003.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0004.out.expected
===================================================================
--- branches/release-0.93/tests/sites/queenbee/pbs/catsn.0004.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0004.out.expected (from rev 5504, branches/release-0.93/tests/sites/queenbee/pbs/catsn.0004.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0004.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0005.out.expected
===================================================================
--- branches/release-0.93/tests/sites/queenbee/pbs/catsn.0005.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0005.out.expected (from rev 5504, branches/release-0.93/tests/sites/queenbee/pbs/catsn.0005.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0005.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0006.out.expected
===================================================================
--- branches/release-0.93/tests/sites/queenbee/pbs/catsn.0006.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0006.out.expected (from rev 5504, branches/release-0.93/tests/sites/queenbee/pbs/catsn.0006.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0006.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0007.out.expected
===================================================================
--- branches/release-0.93/tests/sites/queenbee/pbs/catsn.0007.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0007.out.expected (from rev 5504, branches/release-0.93/tests/sites/queenbee/pbs/catsn.0007.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0007.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0008.out.expected
===================================================================
--- branches/release-0.93/tests/sites/queenbee/pbs/catsn.0008.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0008.out.expected (from rev 5504, branches/release-0.93/tests/sites/queenbee/pbs/catsn.0008.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0008.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0009.out.expected
===================================================================
--- branches/release-0.93/tests/sites/queenbee/pbs/catsn.0009.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0009.out.expected (from rev 5504, branches/release-0.93/tests/sites/queenbee/pbs/catsn.0009.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0009.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0010.out.expected
===================================================================
--- branches/release-0.93/tests/sites/queenbee/pbs/catsn.0010.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0010.out.expected (from rev 5504, branches/release-0.93/tests/sites/queenbee/pbs/catsn.0010.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0010.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/queenbee/pbs/data.txt
===================================================================
--- branches/release-0.93/tests/sites/queenbee/pbs/data.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/queenbee/pbs/data.txt (from rev 5504, branches/release-0.93/tests/sites/queenbee/pbs/data.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/queenbee/pbs/data.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/queenbee/pbs/sites.template.xml
===================================================================
--- branches/release-0.93/tests/sites/queenbee/pbs/sites.template.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,8 +0,0 @@
-<config>
-<pool handle="queenbee-pbs">
- <execution jobmanager="local:pbs" provider="local" url="none" />
- <filesystem provider="local" url="none" />
- <profile key="jobThrottle" namespace="karajan">0</profile>
- <workdirectory>_WORK_</workdirectory>
-</pool>
-</config>
Copied: branches/release-0.93.1/tests/sites/queenbee/pbs/sites.template.xml (from rev 5504, branches/release-0.93/tests/sites/queenbee/pbs/sites.template.xml)
===================================================================
--- branches/release-0.93.1/tests/sites/queenbee/pbs/sites.template.xml (rev 0)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,8 @@
+<config>
+<pool handle="queenbee-pbs">
+ <execution jobmanager="local:pbs" provider="local" url="none" />
+ <filesystem provider="local" url="none" />
+ <profile key="jobThrottle" namespace="karajan">0</profile>
+ <workdirectory>_WORK_</workdirectory>
+</pool>
+</config>
Deleted: branches/release-0.93.1/tests/sites/queenbee/pbs/tc.template.data
===================================================================
--- branches/release-0.93/tests/sites/queenbee/pbs/tc.template.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-queenbee-pbs echo /bin/echo INSTALLED INTEL32::LINUX
-queenbee-pbs cat /bin/cat INSTALLED INTEL32::LINUX
-queenbee-pbs ls /bin/ls INSTALLED INTEL32::LINUX
-queenbee-pbs grep /bin/grep INSTALLED INTEL32::LINUX
-queenbee-pbs sort /bin/sort INSTALLED INTEL32::LINUX
-queenbee-pbs paste /bin/paste INSTALLED INTEL32::LINUX
-queenbee-pbs wc /usr/bin/wc INSTALLED INTEL32::LINUX
Copied: branches/release-0.93.1/tests/sites/queenbee/pbs/tc.template.data (from rev 5504, branches/release-0.93/tests/sites/queenbee/pbs/tc.template.data)
===================================================================
--- branches/release-0.93.1/tests/sites/queenbee/pbs/tc.template.data (rev 0)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+queenbee-pbs echo /bin/echo INSTALLED INTEL32::LINUX
+queenbee-pbs cat /bin/cat INSTALLED INTEL32::LINUX
+queenbee-pbs ls /bin/ls INSTALLED INTEL32::LINUX
+queenbee-pbs grep /bin/grep INSTALLED INTEL32::LINUX
+queenbee-pbs sort /bin/sort INSTALLED INTEL32::LINUX
+queenbee-pbs paste /bin/paste INSTALLED INTEL32::LINUX
+queenbee-pbs wc /usr/bin/wc INSTALLED INTEL32::LINUX
Deleted: branches/release-0.93.1/tests/sites/queenbee/pbs/title.txt
===================================================================
--- branches/release-0.93/tests/sites/queenbee/pbs/title.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-QueenBee PBS Configuration Test
Copied: branches/release-0.93.1/tests/sites/queenbee/pbs/title.txt (from rev 5504, branches/release-0.93/tests/sites/queenbee/pbs/title.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/queenbee/pbs/title.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/queenbee/pbs/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+QueenBee PBS Configuration Test
Deleted: branches/release-0.93.1/tests/sites/ranger/gt2/001-catsn-ranger.swift
===================================================================
--- branches/release-0.93/tests/sites/ranger/gt2/001-catsn-ranger.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/gt2/001-catsn-ranger.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,15 +0,0 @@
-type file;
-
-app (file o) cat (file i)
-{
- cat @i stdout=@o;
-}
-
-string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-string char[] = @strsplit(t, "");
-
-file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
-foreach j in [1:@toint(@arg("n","10"))] {
- file data<"data.txt">;
- out[j] = cat(data);
-}
Copied: branches/release-0.93.1/tests/sites/ranger/gt2/001-catsn-ranger.swift (from rev 5504, branches/release-0.93/tests/sites/ranger/gt2/001-catsn-ranger.swift)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/gt2/001-catsn-ranger.swift (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/gt2/001-catsn-ranger.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,15 @@
+type file;
+
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
+
+string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+string char[] = @strsplit(t, "");
+
+file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
+foreach j in [1:@toint(@arg("n","10"))] {
+ file data<"data.txt">;
+ out[j] = cat(data);
+}
Deleted: branches/release-0.93.1/tests/sites/ranger/gt2/cf
===================================================================
--- branches/release-0.93/tests/sites/ranger/gt2/cf 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/gt2/cf 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-wrapperlog.always.transfer=true
-sitedir.keep=true
-execution.retries=0
-lazy.errors=false
-status.mode=provider
-use.provider.staging=true
-provider.staging.pin.swiftfiles=false
Copied: branches/release-0.93.1/tests/sites/ranger/gt2/cf (from rev 5504, branches/release-0.93/tests/sites/ranger/gt2/cf)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/gt2/cf (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/gt2/cf 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+wrapperlog.always.transfer=true
+sitedir.keep=true
+execution.retries=0
+lazy.errors=false
+status.mode=provider
+use.provider.staging=true
+provider.staging.pin.swiftfiles=false
Deleted: branches/release-0.93.1/tests/sites/ranger/gt2/data.txt
===================================================================
--- branches/release-0.93/tests/sites/ranger/gt2/data.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/gt2/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-ranger testing yeehaw
Copied: branches/release-0.93.1/tests/sites/ranger/gt2/data.txt (from rev 5504, branches/release-0.93/tests/sites/ranger/gt2/data.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/gt2/data.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/gt2/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+ranger testing yeehaw
Deleted: branches/release-0.93.1/tests/sites/ranger/gt2/sites.template.xml
===================================================================
--- branches/release-0.93/tests/sites/ranger/gt2/sites.template.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/gt2/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,16 +0,0 @@
-<config>
-<pool handle="ranger">
- <execution provider="coaster" jobManager="gt2:SGE" url="129.114.50.165"/>
- <filesystem provider="gsiftp" url="gsiftp://129.114.50.166"/>
- <profile namespace="globus" key="maxtime">3600</profile>
- <profile namespace="globus" key="maxWallTime">00:00:03</profile>
- <profile namespace="globus" key="jobsPerNode">1</profile>
- <profile namespace="globus" key="nodeGranularity">16</profile>
- <profile namespace="globus" key="maxNodes">16</profile>
- <profile namespace="globus" key="queue">development</profile>
- <profile namespace="karajan" key="jobThrottle">0.9</profile>
- <profile namespace="globus" key="project">TG-DBS080004N</profile>
- <profile namespace="globus" key="pe">16way</profile>
- <workdirectory>_WORK_</workdirectory>
-</pool>
-</config>
Copied: branches/release-0.93.1/tests/sites/ranger/gt2/sites.template.xml (from rev 5504, branches/release-0.93/tests/sites/ranger/gt2/sites.template.xml)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/gt2/sites.template.xml (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/gt2/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,16 @@
+<config>
+<pool handle="ranger">
+ <execution provider="coaster" jobManager="gt2:SGE" url="129.114.50.165"/>
+ <filesystem provider="gsiftp" url="gsiftp://129.114.50.166"/>
+ <profile namespace="globus" key="maxtime">3600</profile>
+ <profile namespace="globus" key="maxWallTime">00:00:03</profile>
+ <profile namespace="globus" key="jobsPerNode">1</profile>
+ <profile namespace="globus" key="nodeGranularity">16</profile>
+ <profile namespace="globus" key="maxNodes">16</profile>
+ <profile namespace="globus" key="queue">development</profile>
+ <profile namespace="karajan" key="jobThrottle">0.9</profile>
+ <profile namespace="globus" key="project">TG-DBS080004N</profile>
+ <profile namespace="globus" key="pe">16way</profile>
+ <workdirectory>_WORK_</workdirectory>
+</pool>
+</config>
Deleted: branches/release-0.93.1/tests/sites/ranger/gt2/start_proxy.sh
===================================================================
--- branches/release-0.93/tests/sites/ranger/gt2/start_proxy.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/gt2/start_proxy.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-myproxy-logon -l dkelly -s myproxy.teragrid.org
Copied: branches/release-0.93.1/tests/sites/ranger/gt2/start_proxy.sh (from rev 5504, branches/release-0.93/tests/sites/ranger/gt2/start_proxy.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/gt2/start_proxy.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/gt2/start_proxy.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+myproxy-logon -l dkelly -s myproxy.teragrid.org
Deleted: branches/release-0.93.1/tests/sites/ranger/gt2/tc.template.data
===================================================================
--- branches/release-0.93/tests/sites/ranger/gt2/tc.template.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/gt2/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-ranger cat /bin/cat
Copied: branches/release-0.93.1/tests/sites/ranger/gt2/tc.template.data (from rev 5504, branches/release-0.93/tests/sites/ranger/gt2/tc.template.data)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/gt2/tc.template.data (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/gt2/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+ranger cat /bin/cat
Deleted: branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.check.sh
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/001-catsn-ranger.check.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -x
-
-for count in `seq --format "%04.f" 1 1 10`
-do
- [ -f catsn.$count.out ] || exit 1
- CONTENTS1=$( cat catsn.$count.out.expected )
- CONTENTS2=$( cat catsn.$count.out )
- [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1
-done
-exit 0
Copied: branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.check.sh (from rev 5504, branches/release-0.93/tests/sites/ranger/local/001-catsn-ranger.check.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.check.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -x
+
+for count in `seq --format "%04.f" 1 1 10`
+do
+ [ -f catsn.$count.out ] || exit 1
+ CONTENTS1=$( cat catsn.$count.out.expected )
+ CONTENTS2=$( cat catsn.$count.out )
+ [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1
+done
+exit 0
Deleted: branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.setup.sh
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/001-catsn-ranger.setup.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-cp -v $GROUP/data.txt . || exit 1
-cp -v $GROUP/*expected . || exit 1
-
-export QUEUE=normal
-
Copied: branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.setup.sh (from rev 5504, branches/release-0.93/tests/sites/ranger/local/001-catsn-ranger.setup.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.setup.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+cp -v $GROUP/data.txt . || exit 1
+cp -v $GROUP/*expected . || exit 1
+
+export QUEUE=normal
+
Deleted: branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.swift
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/001-catsn-ranger.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,15 +0,0 @@
-type file;
-
-app (file o) cat (file i)
-{
- cat @i stdout=@o;
-}
-
-string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-string char[] = @strsplit(t, "");
-
-file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
-foreach j in [1:@toint(@arg("n","10"))] {
- file data<"data.txt">;
- out[j] = cat(data);
-}
Copied: branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.swift (from rev 5504, branches/release-0.93/tests/sites/ranger/local/001-catsn-ranger.swift)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.swift (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,15 @@
+type file;
+
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
+
+string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+string char[] = @strsplit(t, "");
+
+file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
+foreach j in [1:@toint(@arg("n","10"))] {
+ file data<"data.txt">;
+ out[j] = cat(data);
+}
Deleted: branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.timeout
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/001-catsn-ranger.timeout 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,2 +0,0 @@
-7200
-
Copied: branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.timeout (from rev 5504, branches/release-0.93/tests/sites/ranger/local/001-catsn-ranger.timeout)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.timeout (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/001-catsn-ranger.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,2 @@
+7200
+
Deleted: branches/release-0.93.1/tests/sites/ranger/local/catsn.0001.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/catsn.0001.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/ranger/local/catsn.0001.out.expected (from rev 5504, branches/release-0.93/tests/sites/ranger/local/catsn.0001.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/catsn.0001.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/ranger/local/catsn.0002.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/catsn.0002.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/ranger/local/catsn.0002.out.expected (from rev 5504, branches/release-0.93/tests/sites/ranger/local/catsn.0002.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/catsn.0002.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/ranger/local/catsn.0003.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/catsn.0003.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/ranger/local/catsn.0003.out.expected (from rev 5504, branches/release-0.93/tests/sites/ranger/local/catsn.0003.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/catsn.0003.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/ranger/local/catsn.0004.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/catsn.0004.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/ranger/local/catsn.0004.out.expected (from rev 5504, branches/release-0.93/tests/sites/ranger/local/catsn.0004.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/catsn.0004.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/ranger/local/catsn.0005.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/catsn.0005.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/ranger/local/catsn.0005.out.expected (from rev 5504, branches/release-0.93/tests/sites/ranger/local/catsn.0005.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/catsn.0005.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/ranger/local/catsn.0006.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/catsn.0006.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/ranger/local/catsn.0006.out.expected (from rev 5504, branches/release-0.93/tests/sites/ranger/local/catsn.0006.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/catsn.0006.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/ranger/local/catsn.0007.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/catsn.0007.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/ranger/local/catsn.0007.out.expected (from rev 5504, branches/release-0.93/tests/sites/ranger/local/catsn.0007.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/catsn.0007.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/ranger/local/catsn.0008.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/catsn.0008.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/ranger/local/catsn.0008.out.expected (from rev 5504, branches/release-0.93/tests/sites/ranger/local/catsn.0008.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/catsn.0008.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/ranger/local/catsn.0009.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/catsn.0009.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/ranger/local/catsn.0009.out.expected (from rev 5504, branches/release-0.93/tests/sites/ranger/local/catsn.0009.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/catsn.0009.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/ranger/local/catsn.0010.out.expected
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/catsn.0010.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/ranger/local/catsn.0010.out.expected (from rev 5504, branches/release-0.93/tests/sites/ranger/local/catsn.0010.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/catsn.0010.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/ranger/local/data.txt
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/data.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/ranger/local/data.txt (from rev 5504, branches/release-0.93/tests/sites/ranger/local/data.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/data.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/ranger/local/sites.template.xml
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/sites.template.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,17 +0,0 @@
-<config>
-<pool handle="ranger">
- <execution jobmanager="local:sge" provider="coaster" url="none"/>
- <filesystem provider="local" url="none" />
- <profile namespace="globus" key="maxWallTime">2</profile>
- <profile namespace="globus" key="maxTime">300</profile>
- <profile key="jobsPerNode" namespace="globus">1</profile>
- <profile key="slots" namespace="globus">1</profile>
- <profile key="nodeGranularity" namespace="globus">16</profile>
- <profile key="maxNodes" namespace="globus">16</profile>
- <profile key="queue" namespace="globus">development</profile>
- <profile key="jobThrottle" namespace="karajan">5.99</profile>
- <profile key="initialScore" namespace="karajan">10000</profile>
- <profile namespace="globus" key="project">TG-DBS080004N</profile>
- <workdirectory>_WORK_</workdirectory>
-</pool>
-</config>
Copied: branches/release-0.93.1/tests/sites/ranger/local/sites.template.xml (from rev 5504, branches/release-0.93/tests/sites/ranger/local/sites.template.xml)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/sites.template.xml (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,17 @@
+<config>
+<pool handle="ranger">
+ <execution jobmanager="local:sge" provider="coaster" url="none"/>
+ <filesystem provider="local" url="none" />
+ <profile namespace="globus" key="maxWallTime">2</profile>
+ <profile namespace="globus" key="maxTime">300</profile>
+ <profile key="jobsPerNode" namespace="globus">1</profile>
+ <profile key="slots" namespace="globus">1</profile>
+ <profile key="nodeGranularity" namespace="globus">16</profile>
+ <profile key="maxNodes" namespace="globus">16</profile>
+ <profile key="queue" namespace="globus">development</profile>
+ <profile key="jobThrottle" namespace="karajan">5.99</profile>
+ <profile key="initialScore" namespace="karajan">10000</profile>
+ <profile namespace="globus" key="project">TG-DBS080004N</profile>
+ <workdirectory>_WORK_</workdirectory>
+</pool>
+</config>
Deleted: branches/release-0.93.1/tests/sites/ranger/local/sleep.swift
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/sleep.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/sleep.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-// *_THIS-SCRIPT-SHOULD-FAIL_*
-app sleep (int i)
-{
- sleep i;
-}
-
-sleep(@toint(@arg("n","300")));
Copied: branches/release-0.93.1/tests/sites/ranger/local/sleep.swift (from rev 5504, branches/release-0.93/tests/sites/ranger/local/sleep.swift)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/sleep.swift (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/sleep.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+// *_THIS-SCRIPT-SHOULD-FAIL_*
+app sleep (int i)
+{
+ sleep i;
+}
+
+sleep(@toint(@arg("n","300")));
Deleted: branches/release-0.93.1/tests/sites/ranger/local/tc.template.data
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/tc.template.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,8 +0,0 @@
-ranger echo /bin/echo INSTALLED INTEL32::LINUX null
-ranger cat /bin/cat INSTALLED INTEL32::LINUX null
-ranger ls /bin/ls INSTALLED INTEL32::LINUX null
-ranger grep /bin/grep INSTALLED INTEL32::LINUX null
-ranger sort /bin/sort INSTALLED INTEL32::LINUX null
-ranger paste /bin/paste INSTALLED INTEL32::LINUX null
-ranger wc /usr/bin/wc INSTALLED INTEL32::LINUX null
-ranger sleep /bin/sleep null null null
Copied: branches/release-0.93.1/tests/sites/ranger/local/tc.template.data (from rev 5504, branches/release-0.93/tests/sites/ranger/local/tc.template.data)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/tc.template.data (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,8 @@
+ranger echo /bin/echo INSTALLED INTEL32::LINUX null
+ranger cat /bin/cat INSTALLED INTEL32::LINUX null
+ranger ls /bin/ls INSTALLED INTEL32::LINUX null
+ranger grep /bin/grep INSTALLED INTEL32::LINUX null
+ranger sort /bin/sort INSTALLED INTEL32::LINUX null
+ranger paste /bin/paste INSTALLED INTEL32::LINUX null
+ranger wc /usr/bin/wc INSTALLED INTEL32::LINUX null
+ranger sleep /bin/sleep null null null
Deleted: branches/release-0.93.1/tests/sites/ranger/local/title.txt
===================================================================
--- branches/release-0.93/tests/sites/ranger/local/title.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/ranger/local/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Ranger local SGE
Copied: branches/release-0.93.1/tests/sites/ranger/local/title.txt (from rev 5504, branches/release-0.93/tests/sites/ranger/local/title.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/ranger/local/title.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/ranger/local/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Ranger local SGE
Deleted: branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.check.sh
===================================================================
--- branches/release-0.93/tests/sites/surveyor/001-catsn-surveyor.check.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -x
-
-for count in `seq --format "%04.f" 1 1 10`
-do
- [ -f catsn.$count.out ] || exit 1
- CONTENTS1=$( cat catsn.$count.out.expected )
- CONTENTS2=$( cat catsn.$count.out )
- [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1
-done
-exit 0
Copied: branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.check.sh (from rev 5504, branches/release-0.93/tests/sites/surveyor/001-catsn-surveyor.check.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.check.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.check.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -x
+
+for count in `seq --format "%04.f" 1 1 10`
+do
+ [ -f catsn.$count.out ] || exit 1
+ CONTENTS1=$( cat catsn.$count.out.expected )
+ CONTENTS2=$( cat catsn.$count.out )
+ [[ $CONTENTS1 == $CONTENTS2 ]] || exit 1
+done
+exit 0
Deleted: branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.setup.sh
===================================================================
--- branches/release-0.93/tests/sites/surveyor/001-catsn-surveyor.setup.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cp -v $GROUP/data.txt . || exit 1
-cp -v $GROUP/*expected . || exit 1
Copied: branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.setup.sh (from rev 5504, branches/release-0.93/tests/sites/surveyor/001-catsn-surveyor.setup.sh)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.setup.sh (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.setup.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cp -v $GROUP/data.txt . || exit 1
+cp -v $GROUP/*expected . || exit 1
Deleted: branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.swift
===================================================================
--- branches/release-0.93/tests/sites/surveyor/001-catsn-surveyor.swift 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,15 +0,0 @@
-type file;
-
-app (file o) cat (file i)
-{
- cat @i stdout=@o;
-}
-
-string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-string char[] = @strsplit(t, "");
-
-file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
-foreach j in [1:@toint(@arg("n","10"))] {
- file data<"data.txt">;
- out[j] = cat(data);
-}
Copied: branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.swift (from rev 5504, branches/release-0.93/tests/sites/surveyor/001-catsn-surveyor.swift)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.swift (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.swift 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,15 @@
+type file;
+
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
+
+string t = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+string char[] = @strsplit(t, "");
+
+file out[]<simple_mapper; location=".", prefix="catsn.",suffix=".out">;
+foreach j in [1:@toint(@arg("n","10"))] {
+ file data<"data.txt">;
+ out[j] = cat(data);
+}
Deleted: branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.timeout
===================================================================
--- branches/release-0.93/tests/sites/surveyor/001-catsn-surveyor.timeout 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-1000
Copied: branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.timeout (from rev 5504, branches/release-0.93/tests/sites/surveyor/001-catsn-surveyor.timeout)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.timeout (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/001-catsn-surveyor.timeout 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+1000
Deleted: branches/release-0.93.1/tests/sites/surveyor/README
===================================================================
--- branches/release-0.93/tests/sites/surveyor/README 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/README 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,3 +0,0 @@
-Be sure to set PROJECT and QUEUE. These settings worked for me, but unsure if they are universal
-export PROJECT=HTCScienceApps
-export QUEUE=default
Copied: branches/release-0.93.1/tests/sites/surveyor/README (from rev 5504, branches/release-0.93/tests/sites/surveyor/README)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/README (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/README 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,3 @@
+Be sure to set PROJECT and QUEUE. These settings worked for me, but unsure if they are universal
+export PROJECT=HTCScienceApps
+export QUEUE=default
Deleted: branches/release-0.93.1/tests/sites/surveyor/catsn.0001.out.expected
===================================================================
--- branches/release-0.93/tests/sites/surveyor/catsn.0001.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/surveyor/catsn.0001.out.expected (from rev 5504, branches/release-0.93/tests/sites/surveyor/catsn.0001.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/catsn.0001.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0001.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/surveyor/catsn.0002.out.expected
===================================================================
--- branches/release-0.93/tests/sites/surveyor/catsn.0002.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/surveyor/catsn.0002.out.expected (from rev 5504, branches/release-0.93/tests/sites/surveyor/catsn.0002.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/catsn.0002.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0002.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/surveyor/catsn.0003.out.expected
===================================================================
--- branches/release-0.93/tests/sites/surveyor/catsn.0003.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/surveyor/catsn.0003.out.expected (from rev 5504, branches/release-0.93/tests/sites/surveyor/catsn.0003.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/catsn.0003.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0003.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/surveyor/catsn.0004.out.expected
===================================================================
--- branches/release-0.93/tests/sites/surveyor/catsn.0004.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/surveyor/catsn.0004.out.expected (from rev 5504, branches/release-0.93/tests/sites/surveyor/catsn.0004.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/catsn.0004.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0004.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/surveyor/catsn.0005.out.expected
===================================================================
--- branches/release-0.93/tests/sites/surveyor/catsn.0005.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/surveyor/catsn.0005.out.expected (from rev 5504, branches/release-0.93/tests/sites/surveyor/catsn.0005.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/catsn.0005.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0005.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/surveyor/catsn.0006.out.expected
===================================================================
--- branches/release-0.93/tests/sites/surveyor/catsn.0006.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/surveyor/catsn.0006.out.expected (from rev 5504, branches/release-0.93/tests/sites/surveyor/catsn.0006.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/catsn.0006.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0006.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/surveyor/catsn.0007.out.expected
===================================================================
--- branches/release-0.93/tests/sites/surveyor/catsn.0007.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/surveyor/catsn.0007.out.expected (from rev 5504, branches/release-0.93/tests/sites/surveyor/catsn.0007.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/catsn.0007.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0007.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/surveyor/catsn.0008.out.expected
===================================================================
--- branches/release-0.93/tests/sites/surveyor/catsn.0008.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/surveyor/catsn.0008.out.expected (from rev 5504, branches/release-0.93/tests/sites/surveyor/catsn.0008.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/catsn.0008.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0008.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/surveyor/catsn.0009.out.expected
===================================================================
--- branches/release-0.93/tests/sites/surveyor/catsn.0009.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/surveyor/catsn.0009.out.expected (from rev 5504, branches/release-0.93/tests/sites/surveyor/catsn.0009.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/catsn.0009.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0009.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/surveyor/catsn.0010.out.expected
===================================================================
--- branches/release-0.93/tests/sites/surveyor/catsn.0010.out.expected 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/surveyor/catsn.0010.out.expected (from rev 5504, branches/release-0.93/tests/sites/surveyor/catsn.0010.out.expected)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/catsn.0010.out.expected (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/catsn.0010.out.expected 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/surveyor/data.txt
===================================================================
--- branches/release-0.93/tests/sites/surveyor/data.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Hello world
Copied: branches/release-0.93.1/tests/sites/surveyor/data.txt (from rev 5504, branches/release-0.93/tests/sites/surveyor/data.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/data.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/data.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Hello world
Deleted: branches/release-0.93.1/tests/sites/surveyor/sites.template.xml
===================================================================
--- branches/release-0.93/tests/sites/surveyor/sites.template.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,22 +0,0 @@
-<config>
- <pool handle="surveyor">
- <filesystem provider="local" />
- <execution provider="coaster" jobmanager="local:cobalt"/>
- <!-- <profile namespace="swift" key="stagingMethod">local</profile> -->
- <profile namespace="globus" key="internalHostname">_HOST_</profile>
- <profile namespace="globus" key="project">_PROJECT_</profile>
- <profile namespace="globus" key="queue">_QUEUE_</profile>
- <profile namespace="globus" key="kernelprofile">zeptoos</profile>
- <profile namespace="globus" key="alcfbgpnat">true</profile>
- <profile namespace="karajan" key="jobthrottle">21</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <profile namespace="globus" key="jobsPerNode">1</profile>
- <profile namespace="globus" key="workerLoggingLevel">DEBUG</profile>
- <profile namespace="globus" key="slots">1</profile>
- <profile namespace="globus" key="maxTime">900</profile> <!-- seconds -->
- <profile namespace="globus" key="nodeGranularity">64</profile>
- <profile namespace="globus" key="maxNodes">64</profile>
- <workdirectory>_WORK_</workdirectory>
- </pool>
-</config>
-
Copied: branches/release-0.93.1/tests/sites/surveyor/sites.template.xml (from rev 5504, branches/release-0.93/tests/sites/surveyor/sites.template.xml)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/sites.template.xml (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/sites.template.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,22 @@
+<config>
+ <pool handle="surveyor">
+ <filesystem provider="local" />
+ <execution provider="coaster" jobmanager="local:cobalt"/>
+ <!-- <profile namespace="swift" key="stagingMethod">local</profile> -->
+ <profile namespace="globus" key="internalHostname">_HOST_</profile>
+ <profile namespace="globus" key="project">_PROJECT_</profile>
+ <profile namespace="globus" key="queue">_QUEUE_</profile>
+ <profile namespace="globus" key="kernelprofile">zeptoos</profile>
+ <profile namespace="globus" key="alcfbgpnat">true</profile>
+ <profile namespace="karajan" key="jobthrottle">21</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <profile namespace="globus" key="jobsPerNode">1</profile>
+ <profile namespace="globus" key="workerLoggingLevel">DEBUG</profile>
+ <profile namespace="globus" key="slots">1</profile>
+ <profile namespace="globus" key="maxTime">900</profile> <!-- seconds -->
+ <profile namespace="globus" key="nodeGranularity">64</profile>
+ <profile namespace="globus" key="maxNodes">64</profile>
+ <workdirectory>_WORK_</workdirectory>
+ </pool>
+</config>
+
Deleted: branches/release-0.93.1/tests/sites/surveyor/tc.template.data
===================================================================
--- branches/release-0.93/tests/sites/surveyor/tc.template.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,7 +0,0 @@
-surveyor echo /bin/echo INSTALLED INTEL32::LINUX
-surveyor cat /bin/cat INSTALLED INTEL32::LINUX
-surveyor ls /bin/ls INSTALLED INTEL32::LINUX
-surveyor grep /bin/grep INSTALLED INTEL32::LINUX
-surveyor sort /bin/sort INSTALLED INTEL32::LINUX
-surveyor paste /bin/paste INSTALLED INTEL32::LINUX
-surveyor wc /usr/bin/wc INSTALLED INTEL32::LINUX
Copied: branches/release-0.93.1/tests/sites/surveyor/tc.template.data (from rev 5504, branches/release-0.93/tests/sites/surveyor/tc.template.data)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/tc.template.data (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/tc.template.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,7 @@
+surveyor echo /bin/echo INSTALLED INTEL32::LINUX
+surveyor cat /bin/cat INSTALLED INTEL32::LINUX
+surveyor ls /bin/ls INSTALLED INTEL32::LINUX
+surveyor grep /bin/grep INSTALLED INTEL32::LINUX
+surveyor sort /bin/sort INSTALLED INTEL32::LINUX
+surveyor paste /bin/paste INSTALLED INTEL32::LINUX
+surveyor wc /usr/bin/wc INSTALLED INTEL32::LINUX
Deleted: branches/release-0.93.1/tests/sites/surveyor/title.txt
===================================================================
--- branches/release-0.93/tests/sites/surveyor/title.txt 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites/surveyor/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1 +0,0 @@
-Surveyor Site Configuration Test
Copied: branches/release-0.93.1/tests/sites/surveyor/title.txt (from rev 5504, branches/release-0.93/tests/sites/surveyor/title.txt)
===================================================================
--- branches/release-0.93.1/tests/sites/surveyor/title.txt (rev 0)
+++ branches/release-0.93.1/tests/sites/surveyor/title.txt 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1 @@
+Surveyor Site Configuration Test
Deleted: branches/release-0.93.1/tests/sites.old/README
===================================================================
--- branches/release-0.93/tests/sites.old/README 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/README 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,28 +0,0 @@
-Site tests
-==========
-
-To run all tests in the root, say:
-
- $ ./run-all
-
-To run a single site test, say:
-
- $ ./run-site <nameofsitefile>
-
-To run a subdirectory of tests, say:
-
- $ ./run-all subdirectory/
-
-The trailing / is important.
-
-The tests in the root of sites/ should generally work for users associated
-with Swift (for example, by being on Swift teragrid allocations or by being
-in an OSG VO)
-
-Tests in wonky/ should run locally against a Swift built with provider-wonky.
-These generally should test the reliabilty mechanisms of Swift.
-
-Tests defined in subdirectories named after hosts (eg tg-login.uc.teragrid.org)
-should be run on that host, and should test functionality available on that
-host (such as a local PBS or condor installation).
-
Copied: branches/release-0.93.1/tests/sites.old/README (from rev 5504, branches/release-0.93/tests/sites.old/README)
===================================================================
--- branches/release-0.93.1/tests/sites.old/README (rev 0)
+++ branches/release-0.93.1/tests/sites.old/README 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,28 @@
+Site tests
+==========
+
+To run all tests in the root, say:
+
+ $ ./run-all
+
+To run a single site test, say:
+
+ $ ./run-site <nameofsitefile>
+
+To run a subdirectory of tests, say:
+
+ $ ./run-all subdirectory/
+
+The trailing / is important.
+
+The tests in the root of sites/ should generally work for users associated
+with Swift (for example, by being on Swift teragrid allocations or by being
+in an OSG VO)
+
+Tests in wonky/ should run locally against a Swift built with provider-wonky.
+These generally should test the reliabilty mechanisms of Swift.
+
+Tests defined in subdirectories named after hosts (eg tg-login.uc.teragrid.org)
+should be run on that host, and should test functionality available on that
+host (such as a local PBS or condor installation).
+
Deleted: branches/release-0.93.1/tests/sites.old/UCLA_Saxon_Tier3-fork.xml
===================================================================
--- branches/release-0.93/tests/sites.old/UCLA_Saxon_Tier3-fork.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/UCLA_Saxon_Tier3-fork.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="UCLA_Saxon_Tier3" >
- <gridftp url="gsiftp://saxon.hosted.ats.ucla.edu" />
- <jobmanager universe="vanilla" url="saxon.hosted.ats.ucla.edu:2119/jobmanager-fork" major="2" />
- <workdirectory >/u/osgdata</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/UCLA_Saxon_Tier3-fork.xml (from rev 5504, branches/release-0.93/tests/sites.old/UCLA_Saxon_Tier3-fork.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/UCLA_Saxon_Tier3-fork.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/UCLA_Saxon_Tier3-fork.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="UCLA_Saxon_Tier3" >
+ <gridftp url="gsiftp://saxon.hosted.ats.ucla.edu" />
+ <jobmanager universe="vanilla" url="saxon.hosted.ats.ucla.edu:2119/jobmanager-fork" major="2" />
+ <workdirectory >/u/osgdata</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-b2-condor.xml
===================================================================
--- branches/release-0.93/tests/sites.old/broken/osg-ucsdt2-b2-condor.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-b2-condor.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
- <pool handle="osg-edu.cs.wisc.edu">
- <gridftp url="gsiftp://osg-gw-4.t2.ucsd.edu" />
- <jobmanager universe="vanilla" url="osg-gw-4.t2.ucsd.edu/jobmanager-condor" major="2" />
- <workdirectory>/osgfs/data/lixi</workdirectory>
- <profile namespace="karajan" key="initialScore">.542</profile>
- <profile namespace="karajan" key="jobThrottle">0.05</profile>
- </pool>
-</config>
Copied: branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-b2-condor.xml (from rev 5504, branches/release-0.93/tests/sites.old/broken/osg-ucsdt2-b2-condor.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-b2-condor.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-b2-condor.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+ <pool handle="osg-edu.cs.wisc.edu">
+ <gridftp url="gsiftp://osg-gw-4.t2.ucsd.edu" />
+ <jobmanager universe="vanilla" url="osg-gw-4.t2.ucsd.edu/jobmanager-condor" major="2" />
+ <workdirectory>/osgfs/data/lixi</workdirectory>
+ <profile namespace="karajan" key="initialScore">.542</profile>
+ <profile namespace="karajan" key="jobThrottle">0.05</profile>
+ </pool>
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-b2-fork.xml
===================================================================
--- branches/release-0.93/tests/sites.old/broken/osg-ucsdt2-b2-fork.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-b2-fork.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
- <pool handle="osg-edu.cs.wisc.edu">
- <gridftp url="gsiftp://osg-gw-4.t2.ucsd.edu" />
- <jobmanager universe="vanilla" url="osg-gw-4.t2.ucsd.edu/jobmanager-fork" major="2" />
- <workdirectory>/osgfs/data/lixi</workdirectory>
- <profile namespace="karajan" key="initialScore">.542</profile>
- <profile namespace="karajan" key="jobThrottle">0.05</profile>
- </pool>
-</config>
Copied: branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-b2-fork.xml (from rev 5504, branches/release-0.93/tests/sites.old/broken/osg-ucsdt2-b2-fork.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-b2-fork.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-b2-fork.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+ <pool handle="osg-edu.cs.wisc.edu">
+ <gridftp url="gsiftp://osg-gw-4.t2.ucsd.edu" />
+ <jobmanager universe="vanilla" url="osg-gw-4.t2.ucsd.edu/jobmanager-fork" major="2" />
+ <workdirectory>/osgfs/data/lixi</workdirectory>
+ <profile namespace="karajan" key="initialScore">.542</profile>
+ <profile namespace="karajan" key="jobThrottle">0.05</profile>
+ </pool>
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-condor.xml
===================================================================
--- branches/release-0.93/tests/sites.old/broken/osg-ucsdt2-condor.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-condor.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,10 +0,0 @@
-<config>
-
- <pool handle="osg-edu.cs.wisc.edu" >
-
- <gridftp url="gsiftp://osg-gw-2.t2.ucsd.edu" />
- <jobmanager universe="vanilla" url="osg-gw-2.t2.ucsd.edu/jobmanager-condor" major="2" />
- <workdirectory>/osgfs/data</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-condor.xml (from rev 5504, branches/release-0.93/tests/sites.old/broken/osg-ucsdt2-condor.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-condor.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-condor.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,10 @@
+<config>
+
+ <pool handle="osg-edu.cs.wisc.edu" >
+
+ <gridftp url="gsiftp://osg-gw-2.t2.ucsd.edu" />
+ <jobmanager universe="vanilla" url="osg-gw-2.t2.ucsd.edu/jobmanager-condor" major="2" />
+ <workdirectory>/osgfs/data</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-fork.xml
===================================================================
--- branches/release-0.93/tests/sites.old/broken/osg-ucsdt2-fork.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-fork.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,10 +0,0 @@
-<config>
-
- <pool handle="osg-edu.cs.wisc.edu" >
-
- <gridftp url="gsiftp://osg-gw-2.t2.ucsd.edu" />
- <jobmanager universe="vanilla" url="osg-gw-2.t2.ucsd.edu/jobmanager-fork" major="2" />
- <workdirectory>/osgfs/data</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-fork.xml (from rev 5504, branches/release-0.93/tests/sites.old/broken/osg-ucsdt2-fork.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-fork.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/broken/osg-ucsdt2-fork.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,10 @@
+<config>
+
+ <pool handle="osg-edu.cs.wisc.edu" >
+
+ <gridftp url="gsiftp://osg-gw-2.t2.ucsd.edu" />
+ <jobmanager universe="vanilla" url="osg-gw-2.t2.ucsd.edu/jobmanager-fork" major="2" />
+ <workdirectory>/osgfs/data</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/broken/tp-pbs-gram4.xml
===================================================================
--- branches/release-0.93/tests/sites.old/broken/tp-pbs-gram4.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/broken/tp-pbs-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="teraport" >
- <gridftp url="gsiftp://tp-osg.ci.uchicago.edu" />
- <execution provider="gt4" url="tp-osg.ci.uchicago.edu:9443" jobmanager="PBS" />
- <workdirectory >/home/benc/swifttest</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/broken/tp-pbs-gram4.xml (from rev 5504, branches/release-0.93/tests/sites.old/broken/tp-pbs-gram4.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/broken/tp-pbs-gram4.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/broken/tp-pbs-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="teraport" >
+ <gridftp url="gsiftp://tp-osg.ci.uchicago.edu" />
+ <execution provider="gt4" url="tp-osg.ci.uchicago.edu:9443" jobmanager="PBS" />
+ <workdirectory >/home/benc/swifttest</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/coaster/coaster-local.xml
===================================================================
--- branches/release-0.93/tests/sites.old/coaster/coaster-local.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/coaster/coaster-local.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,21 +0,0 @@
-<config>
-
-<!-- sites.xml specifies details of the sites that Swift can run on.
-
-The first entry entry, for localhost, should work on most linux-like systems
-without any change.
-
-It may be necessary to change the two occurences of /var/tmp to a different
-working directory.
-
--->
-
-
- <pool handle="localhost">
- <gridftp url="local://localhost" />
- <execution provider="coaster" jobmanager="local:local" url="localhost" />
- <workdirectory >/var/tmp</workdirectory>
- <profile namespace="globus" key="coastersPerNode">5</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/coaster/coaster-local.xml (from rev 5504, branches/release-0.93/tests/sites.old/coaster/coaster-local.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/coaster/coaster-local.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/coaster/coaster-local.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,21 @@
+<config>
+
+<!-- sites.xml specifies details of the sites that Swift can run on.
+
+The first entry entry, for localhost, should work on most linux-like systems
+without any change.
+
+It may be necessary to change the two occurences of /var/tmp to a different
+working directory.
+
+-->
+
+
+ <pool handle="localhost">
+ <gridftp url="local://localhost" />
+ <execution provider="coaster" jobmanager="local:local" url="localhost" />
+ <workdirectory >/var/tmp</workdirectory>
+ <profile namespace="globus" key="coastersPerNode">5</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/coaster/fletch-coaster-gram2-gram2-condor.xml
===================================================================
--- branches/release-0.93/tests/sites.old/coaster/fletch-coaster-gram2-gram2-condor.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/coaster/fletch-coaster-gram2-gram2-condor.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="teraport" >
- <gridftp url="gsiftp://fletch.bsd.uchicago.edu" />
-<execution provider="coaster" url="fletch.bsd.uchicago.edu" jobManager="gt2:gt2:condor" />
- <workdirectory >/disks/gpfs/swift/site-test</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/coaster/fletch-coaster-gram2-gram2-condor.xml (from rev 5504, branches/release-0.93/tests/sites.old/coaster/fletch-coaster-gram2-gram2-condor.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/coaster/fletch-coaster-gram2-gram2-condor.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/coaster/fletch-coaster-gram2-gram2-condor.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="teraport" >
+ <gridftp url="gsiftp://fletch.bsd.uchicago.edu" />
+<execution provider="coaster" url="fletch.bsd.uchicago.edu" jobManager="gt2:gt2:condor" />
+ <workdirectory >/disks/gpfs/swift/site-test</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/coaster/fletch-coaster-gram2-gram2-fork.xml
===================================================================
--- branches/release-0.93/tests/sites.old/coaster/fletch-coaster-gram2-gram2-fork.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/coaster/fletch-coaster-gram2-gram2-fork.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="teraport" >
- <gridftp url="gsiftp://fletch.bsd.uchicago.edu" />
-<execution provider="coaster" url="fletch.bsd.uchicago.edu" jobManager="gt2:gt2:fork" />
- <workdirectory >/disks/gpfs/swift/site-test</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/coaster/fletch-coaster-gram2-gram2-fork.xml (from rev 5504, branches/release-0.93/tests/sites.old/coaster/fletch-coaster-gram2-gram2-fork.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/coaster/fletch-coaster-gram2-gram2-fork.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/coaster/fletch-coaster-gram2-gram2-fork.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="teraport" >
+ <gridftp url="gsiftp://fletch.bsd.uchicago.edu" />
+<execution provider="coaster" url="fletch.bsd.uchicago.edu" jobManager="gt2:gt2:fork" />
+ <workdirectory >/disks/gpfs/swift/site-test</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/coaster/renci-engage-coaster.xml
===================================================================
--- branches/release-0.93/tests/sites.old/coaster/renci-engage-coaster.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/coaster/renci-engage-coaster.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,11 +0,0 @@
-<config>
-
- <pool handle="renci-engage" >
- <gridftp url="gsiftp://belhaven-1.renci.org/" />
-<!-- <filesystem provider="coaster" url="gt2://belhaven-1.renci.org" /> -->
- <execution provider="coaster" url="belhaven-1.renci.org" jobManager="gt2:gt2:condor" />
- <workdirectory >/nfs/osg-data/osgedu/benc/swift</workdirectory>
-<profile namespace="globus" key="coasterInternalIP">192.168.1.11</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/coaster/renci-engage-coaster.xml (from rev 5504, branches/release-0.93/tests/sites.old/coaster/renci-engage-coaster.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/coaster/renci-engage-coaster.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/coaster/renci-engage-coaster.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,11 @@
+<config>
+
+ <pool handle="renci-engage" >
+ <gridftp url="gsiftp://belhaven-1.renci.org/" />
+<!-- <filesystem provider="coaster" url="gt2://belhaven-1.renci.org" /> -->
+ <execution provider="coaster" url="belhaven-1.renci.org" jobManager="gt2:gt2:condor" />
+ <workdirectory >/nfs/osg-data/osgedu/benc/swift</workdirectory>
+<profile namespace="globus" key="coasterInternalIP">192.168.1.11</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/coaster/teraport-gt2-gt2-pbs.xml
===================================================================
--- branches/release-0.93/tests/sites.old/coaster/teraport-gt2-gt2-pbs.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/coaster/teraport-gt2-gt2-pbs.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
- <pool handle="teraport" >
- <profile namespace="globus" key="queue">fast</profile>
- <profile namespace="globus" key="coasterWorkerMaxwalltime">00:05:00</profile>
- <gridftp url="gsiftp://tp-osg.ci.uchicago.edu" />
- <execution provider="coaster" url="tp-osg.ci.uchicago.edu" jobmanager="gt2:gt2:pbs" />
- <workdirectory>/gpfs/teraport/benc/swifttest</workdirectory>
- </pool>
-</config>
Copied: branches/release-0.93.1/tests/sites.old/coaster/teraport-gt2-gt2-pbs.xml (from rev 5504, branches/release-0.93/tests/sites.old/coaster/teraport-gt2-gt2-pbs.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/coaster/teraport-gt2-gt2-pbs.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/coaster/teraport-gt2-gt2-pbs.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+ <pool handle="teraport" >
+ <profile namespace="globus" key="queue">fast</profile>
+ <profile namespace="globus" key="coasterWorkerMaxwalltime">00:05:00</profile>
+ <gridftp url="gsiftp://tp-osg.ci.uchicago.edu" />
+ <execution provider="coaster" url="tp-osg.ci.uchicago.edu" jobmanager="gt2:gt2:pbs" />
+ <workdirectory>/gpfs/teraport/benc/swifttest</workdirectory>
+ </pool>
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/coaster/tgncsa-hg-coaster-pbs-gram2.xml
===================================================================
--- branches/release-0.93/tests/sites.old/coaster/tgncsa-hg-coaster-pbs-gram2.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/coaster/tgncsa-hg-coaster-pbs-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,12 +0,0 @@
-<config>
-
- <pool handle="tgncsa-hg" >
- <gridftp url="gsiftp://gt2-gridftp-hg.ncsa.teragrid.org" />
- <execution provider="coaster" url="grid-hg.ncsa.teragrid.org" jobManager="gt2:pbs" />
-
- <workdirectory >/home/ac/benc</workdirectory>
- <profile namespace="globus" key="project">TG-CCR080002N</profile>
- <profile namespace="karajan" key="jobThrottle">4</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/coaster/tgncsa-hg-coaster-pbs-gram2.xml (from rev 5504, branches/release-0.93/tests/sites.old/coaster/tgncsa-hg-coaster-pbs-gram2.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/coaster/tgncsa-hg-coaster-pbs-gram2.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/coaster/tgncsa-hg-coaster-pbs-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,12 @@
+<config>
+
+ <pool handle="tgncsa-hg" >
+ <gridftp url="gsiftp://gt2-gridftp-hg.ncsa.teragrid.org" />
+ <execution provider="coaster" url="grid-hg.ncsa.teragrid.org" jobManager="gt2:pbs" />
+
+ <workdirectory >/home/ac/benc</workdirectory>
+ <profile namespace="globus" key="project">TG-CCR080002N</profile>
+ <profile namespace="karajan" key="jobThrottle">4</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/coaster/tgncsa-hg-coaster-pbs-gram4.xml
===================================================================
--- branches/release-0.93/tests/sites.old/coaster/tgncsa-hg-coaster-pbs-gram4.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/coaster/tgncsa-hg-coaster-pbs-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,12 +0,0 @@
-<config>
-
- <pool handle="tgncsa-hg" >
- <gridftp url="gsiftp://gt2-gridftp-hg.ncsa.teragrid.org" />
- <execution provider="coaster" url="grid-hg.ncsa.teragrid.org" jobManager="gt4:pbs" />
-
- <workdirectory >/home/ac/benc</workdirectory>
- <profile namespace="globus" key="project">TG-CCR080002N</profile>
- <profile namespace="karajan" key="jobThrottle">4</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/coaster/tgncsa-hg-coaster-pbs-gram4.xml (from rev 5504, branches/release-0.93/tests/sites.old/coaster/tgncsa-hg-coaster-pbs-gram4.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/coaster/tgncsa-hg-coaster-pbs-gram4.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/coaster/tgncsa-hg-coaster-pbs-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,12 @@
+<config>
+
+ <pool handle="tgncsa-hg" >
+ <gridftp url="gsiftp://gt2-gridftp-hg.ncsa.teragrid.org" />
+ <execution provider="coaster" url="grid-hg.ncsa.teragrid.org" jobManager="gt4:pbs" />
+
+ <workdirectory >/home/ac/benc</workdirectory>
+ <profile namespace="globus" key="project">TG-CCR080002N</profile>
+ <profile namespace="karajan" key="jobThrottle">4</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/coaster/uj-pbs-gram2.xml
===================================================================
--- branches/release-0.93/tests/sites.old/coaster/uj-pbs-gram2.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/coaster/uj-pbs-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,11 +0,0 @@
-<config>
-
- <pool handle="teraport" >
- <gridftp url="gsiftp://osg-ce.grid.uj.ac.za" />
- <execution provider="coaster" url="osg-ce.grid.uj.ac.za" jobManager="gt2:pbs" />
-
- <workdirectory >/nfs/home/benc/swifttest</workdirectory>
- <profile namespace="karajan" key="jobThrottle">4</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/coaster/uj-pbs-gram2.xml (from rev 5504, branches/release-0.93/tests/sites.old/coaster/uj-pbs-gram2.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/coaster/uj-pbs-gram2.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/coaster/uj-pbs-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,11 @@
+<config>
+
+ <pool handle="teraport" >
+ <gridftp url="gsiftp://osg-ce.grid.uj.ac.za" />
+ <execution provider="coaster" url="osg-ce.grid.uj.ac.za" jobManager="gt2:pbs" />
+
+ <workdirectory >/nfs/home/benc/swifttest</workdirectory>
+ <profile namespace="karajan" key="jobThrottle">4</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/communicado.ci.uchicago.edu/local-condor.xml
===================================================================
--- branches/release-0.93/tests/sites.old/communicado.ci.uchicago.edu/local-condor.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/communicado.ci.uchicago.edu/local-condor.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="teraport" >
- <gridftp url="local://localhost" />
- <execution provider="condor" />
- <workdirectory >/home/benc/swifttest</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/communicado.ci.uchicago.edu/local-condor.xml (from rev 5504, branches/release-0.93/tests/sites.old/communicado.ci.uchicago.edu/local-condor.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/communicado.ci.uchicago.edu/local-condor.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/communicado.ci.uchicago.edu/local-condor.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="teraport" >
+ <gridftp url="local://localhost" />
+ <execution provider="condor" />
+ <workdirectory >/home/benc/swifttest</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/fletch-condor-gram2.xml
===================================================================
--- branches/release-0.93/tests/sites.old/fletch-condor-gram2.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/fletch-condor-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="teraport" >
- <gridftp url="gsiftp://fletch.bsd.uchicago.edu" />
- <jobmanager universe="vanilla" url="fletch.bsd.uchicago.edu/jobmanager-condor" major="2" />
- <workdirectory >/disks/gpfs/swift/site-test</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/fletch-condor-gram2.xml (from rev 5504, branches/release-0.93/tests/sites.old/fletch-condor-gram2.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/fletch-condor-gram2.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/fletch-condor-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="teraport" >
+ <gridftp url="gsiftp://fletch.bsd.uchicago.edu" />
+ <jobmanager universe="vanilla" url="fletch.bsd.uchicago.edu/jobmanager-condor" major="2" />
+ <workdirectory >/disks/gpfs/swift/site-test</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/fletch-fork-gram2.xml
===================================================================
--- branches/release-0.93/tests/sites.old/fletch-fork-gram2.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/fletch-fork-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="teraport" >
- <gridftp url="gsiftp://fletch.bsd.uchicago.edu" />
- <jobmanager universe="vanilla" url="fletch.bsd.uchicago.edu/jobmanager-fork" major="2" />
- <workdirectory >/disks/gpfs/swift/site-test</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/fletch-fork-gram2.xml (from rev 5504, branches/release-0.93/tests/sites.old/fletch-fork-gram2.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/fletch-fork-gram2.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/fletch-fork-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="teraport" >
+ <gridftp url="gsiftp://fletch.bsd.uchicago.edu" />
+ <jobmanager universe="vanilla" url="fletch.bsd.uchicago.edu/jobmanager-fork" major="2" />
+ <workdirectory >/disks/gpfs/swift/site-test</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/gwynn.bsd.uchicago.edu/condor-provider.xml
===================================================================
--- branches/release-0.93/tests/sites.old/gwynn.bsd.uchicago.edu/condor-provider.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/gwynn.bsd.uchicago.edu/condor-provider.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="teraport" >
- <gridftp url="local://localhost" />
- <execution provider="condor" />
- <workdirectory >/disks/gpfs/swift/site-test</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/gwynn.bsd.uchicago.edu/condor-provider.xml (from rev 5504, branches/release-0.93/tests/sites.old/gwynn.bsd.uchicago.edu/condor-provider.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/gwynn.bsd.uchicago.edu/condor-provider.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/gwynn.bsd.uchicago.edu/condor-provider.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="teraport" >
+ <gridftp url="local://localhost" />
+ <execution provider="condor" />
+ <workdirectory >/disks/gpfs/swift/site-test</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/local-wrapper-args-file.xml
===================================================================
--- branches/release-0.93/tests/sites.old/local-wrapper-args-file.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/local-wrapper-args-file.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,12 +0,0 @@
-<config>
-
- <pool handle="localhost">
- <execution provider="local" />
- <gridftp url="local://localhost" />
- <workdirectory >/var/tmp</workdirectory>
- <profile namespace="karajan" key="jobThrottle">0</profile>
- <profile namespace="karajan" key="delayBase">0</profile>
- <profile namespace="karajan" key="wrapper.parameter.mode">files</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/local-wrapper-args-file.xml (from rev 5504, branches/release-0.93/tests/sites.old/local-wrapper-args-file.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/local-wrapper-args-file.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/local-wrapper-args-file.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,12 @@
+<config>
+
+ <pool handle="localhost">
+ <execution provider="local" />
+ <gridftp url="local://localhost" />
+ <workdirectory >/var/tmp</workdirectory>
+ <profile namespace="karajan" key="jobThrottle">0</profile>
+ <profile namespace="karajan" key="delayBase">0</profile>
+ <profile namespace="karajan" key="wrapper.parameter.mode">files</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/localhost.xml
===================================================================
--- branches/release-0.93/tests/sites.old/localhost.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/localhost.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,14 +0,0 @@
-
-<!-- Local execution in the given workspace -->
-
-<config>
-
- <pool handle="localhost" sysinfo="INTEL32::LINUX">
- <gridftp url="local://localhost" />
- <execution provider="local" url="none" />
- <workdirectory>_WORK_</workdirectory>
- <profile namespace="karajan" key="jobThrottle">0.08</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/localhost.xml (from rev 5504, branches/release-0.93/tests/sites.old/localhost.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/localhost.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/localhost.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,14 @@
+
+<!-- Local execution in the given workspace -->
+
+<config>
+
+ <pool handle="localhost" sysinfo="INTEL32::LINUX">
+ <gridftp url="local://localhost" />
+ <execution provider="local" url="none" />
+ <workdirectory>_WORK_</workdirectory>
+ <profile namespace="karajan" key="jobThrottle">0.08</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/osg-edu.cs.wisc.edu-condor.xml
===================================================================
--- branches/release-0.93/tests/sites.old/osg-edu.cs.wisc.edu-condor.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/osg-edu.cs.wisc.edu-condor.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="osg-edu.cs.wisc.edu" >
- <gridftp url="gsiftp://osg-edu.cs.wisc.edu/" />
- <jobmanager universe="vanilla" url="osg-edu.cs.wisc.edu:2119/jobmanager-condor" major="2" />
- <workdirectory >/nfs/osg-app</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/osg-edu.cs.wisc.edu-condor.xml (from rev 5504, branches/release-0.93/tests/sites.old/osg-edu.cs.wisc.edu-condor.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/osg-edu.cs.wisc.edu-condor.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/osg-edu.cs.wisc.edu-condor.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="osg-edu.cs.wisc.edu" >
+ <gridftp url="gsiftp://osg-edu.cs.wisc.edu/" />
+ <jobmanager universe="vanilla" url="osg-edu.cs.wisc.edu:2119/jobmanager-condor" major="2" />
+ <workdirectory >/nfs/osg-app</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/osg-edu.cs.wisc.edu-fork.xml
===================================================================
--- branches/release-0.93/tests/sites.old/osg-edu.cs.wisc.edu-fork.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/osg-edu.cs.wisc.edu-fork.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="osg-edu.cs.wisc.edu" >
- <gridftp url="gsiftp://osg-edu.cs.wisc.edu/" />
- <jobmanager universe="vanilla" url="osg-edu.cs.wisc.edu:2119/jobmanager-fork" major="2" />
- <workdirectory >/nfs/osg-app</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/osg-edu.cs.wisc.edu-fork.xml (from rev 5504, branches/release-0.93/tests/sites.old/osg-edu.cs.wisc.edu-fork.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/osg-edu.cs.wisc.edu-fork.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/osg-edu.cs.wisc.edu-fork.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="osg-edu.cs.wisc.edu" >
+ <gridftp url="gsiftp://osg-edu.cs.wisc.edu/" />
+ <jobmanager universe="vanilla" url="osg-edu.cs.wisc.edu:2119/jobmanager-fork" major="2" />
+ <workdirectory >/nfs/osg-app</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/pads-pbs-coasters.sh
===================================================================
--- branches/release-0.93/tests/sites.old/pads-pbs-coasters.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/pads-pbs-coasters.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,6 +0,0 @@
-
-# GROUPLIST definition to run pbs tests
-
-GROUPLIST=(
- $TESTDIR/providers/local-pbs-coasters \
-)
Copied: branches/release-0.93.1/tests/sites.old/pads-pbs-coasters.sh (from rev 5504, branches/release-0.93/tests/sites.old/pads-pbs-coasters.sh)
===================================================================
--- branches/release-0.93.1/tests/sites.old/pads-pbs-coasters.sh (rev 0)
+++ branches/release-0.93.1/tests/sites.old/pads-pbs-coasters.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,6 @@
+
+# GROUPLIST definition to run pbs tests
+
+GROUPLIST=(
+ $TESTDIR/providers/local-pbs-coasters \
+)
Deleted: branches/release-0.93.1/tests/sites.old/renci-engage-condor.xml
===================================================================
--- branches/release-0.93/tests/sites.old/renci-engage-condor.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/renci-engage-condor.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="renci-engage" >
- <gridftp url="gsiftp://belhaven-1.renci.org/" />
- <jobmanager universe="vanilla" url="belhaven-1.renci.org:2119/jobmanager-condor" major="2" />
- <workdirectory >/nfs/osg-data/osgedu/benc/swift</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/renci-engage-condor.xml (from rev 5504, branches/release-0.93/tests/sites.old/renci-engage-condor.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/renci-engage-condor.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/renci-engage-condor.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="renci-engage" >
+ <gridftp url="gsiftp://belhaven-1.renci.org/" />
+ <jobmanager universe="vanilla" url="belhaven-1.renci.org:2119/jobmanager-condor" major="2" />
+ <workdirectory >/nfs/osg-data/osgedu/benc/swift</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/run-all
===================================================================
--- branches/release-0.93/tests/sites.old/run-all 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/run-all 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-export WORKED=""
-export FAILED=""
-
-for BASE in $1*.xml; do
- ./run-site $BASE
- EC=$?
- if [ "$EC" != "0" ]; then
- echo SITE FAIL! Exit code $EC for site definition $BASE
- FAILED="$FAILED $BASE"
- else
- WORKED="$WORKED $BASE"
- fi
-done
-
-if [ "X$FAILED" = "" ]; then
- echo No tests failed
- exit 0
-else
- echo These sites failed: $FAILED
- echo These sites worked: $WORKED
- exit 1
-fi
-
Copied: branches/release-0.93.1/tests/sites.old/run-all (from rev 5504, branches/release-0.93/tests/sites.old/run-all)
===================================================================
--- branches/release-0.93.1/tests/sites.old/run-all (rev 0)
+++ branches/release-0.93.1/tests/sites.old/run-all 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+export WORKED=""
+export FAILED=""
+
+for BASE in $1*.xml; do
+ ./run-site $BASE
+ EC=$?
+ if [ "$EC" != "0" ]; then
+ echo SITE FAIL! Exit code $EC for site definition $BASE
+ FAILED="$FAILED $BASE"
+ else
+ WORKED="$WORKED $BASE"
+ fi
+done
+
+if [ "X$FAILED" = "" ]; then
+ echo No tests failed
+ exit 0
+else
+ echo These sites failed: $FAILED
+ echo These sites worked: $WORKED
+ exit 1
+fi
+
Deleted: branches/release-0.93.1/tests/sites.old/run-site
===================================================================
--- branches/release-0.93/tests/sites.old/run-site 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/run-site 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-cd ../language-behaviour
-
-./generate-tc.data
-
-cat tc.data ../sites/tc.data > tmp.tc.data.sites
-
-SITE=$1
-
-echo testing site configuration: $SITE
-
-export SWIFT_TEST_PARAMS="-sites.file ../sites/${SITE} -tc.file tmp.tc.data.sites"
-export SWIFT_TEST_EXCEPTIONS=no
-
-
-./run 061-cattwo 130-fmri 103-quote.swift 1032-singlequote.swift 1031-quote.swift 1033-singlequote.swift 141-space-in-filename 142-space-and-quotes
-#./run 061-cattwo
Copied: branches/release-0.93.1/tests/sites.old/run-site (from rev 5504, branches/release-0.93/tests/sites.old/run-site)
===================================================================
--- branches/release-0.93.1/tests/sites.old/run-site (rev 0)
+++ branches/release-0.93.1/tests/sites.old/run-site 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+cd ../language-behaviour
+
+./generate-tc.data
+
+cat tc.data ../sites/tc.data > tmp.tc.data.sites
+
+SITE=$1
+
+echo testing site configuration: $SITE
+
+export SWIFT_TEST_PARAMS="-sites.file ../sites/${SITE} -tc.file tmp.tc.data.sites"
+export SWIFT_TEST_EXCEPTIONS=no
+
+
+./run 061-cattwo 130-fmri 103-quote.swift 1032-singlequote.swift 1031-quote.swift 1033-singlequote.swift 141-space-in-filename 142-space-and-quotes
+#./run 061-cattwo
Deleted: branches/release-0.93.1/tests/sites.old/tc.data
===================================================================
--- branches/release-0.93/tests/sites.old/tc.data 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tc.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,81 +0,0 @@
-#This is the transformation catalog.
-#
-#It comes pre-configured with a number of simple transformations with
-#paths that are likely to work on a linux box. However, on some systems,
-#the paths to these executables will be different (for example, sometimes
-#some of these programs are found in /usr/bin rather than in /bin)
-#
-#NOTE WELL: fields in this file must be separated by tabs, not spaces; and
-#there must be no trailing whitespace at the end of each line.
-#
-# sitename transformation path INSTALLED platform profiles
-teraport echo /bin/echo INSTALLED INTEL32::LINUX null
-teraport cat /bin/cat INSTALLED INTEL32::LINUX null
-teraport ls /bin/ls INSTALLED INTEL32::LINUX null
-teraport wc /bin/wc INSTALLED INTEL32::LINUX null
-teraport grep /bin/grep INSTALLED INTEL32::LINUX null
-teraport sort /bin/sort INSTALLED INTEL32::LINUX null
-teraport paste /bin/paste INSTALLED INTEL32::LINUX null
-teraport touch /bin/touch INSTALLED INTEL32::LINUX null
-tguc echo /bin/echo INSTALLED INTEL32::LINUX null
-tguc cat /bin/cat INSTALLED INTEL32::LINUX null
-tguc ls /bin/ls INSTALLED INTEL32::LINUX null
-tguc wc /bin/wc INSTALLED INTEL32::LINUX null
-tguc grep /bin/grep INSTALLED INTEL32::LINUX null
-tguc sort /bin/sort INSTALLED INTEL32::LINUX null
-tguc paste /bin/paste INSTALLED INTEL32::LINUX null
-tguc touch /bin/touch INSTALLED INTEL32::LINUX null
-osg-edu.cs.wisc.edu echo /bin/echo INSTALLED INTEL32::LINUX null
-osg-edu.cs.wisc.edu cat /bin/cat INSTALLED INTEL32::LINUX null
-osg-edu.cs.wisc.edu ls /bin/ls INSTALLED INTEL32::LINUX null
-osg-edu.cs.wisc.edu wc /bin/wc INSTALLED INTEL32::LINUX null
-osg-edu.cs.wisc.edu grep /bin/grep INSTALLED INTEL32::LINUX null
-osg-edu.cs.wisc.edu sort /bin/sort INSTALLED INTEL32::LINUX null
-osg-edu.cs.wisc.edu paste /bin/paste INSTALLED INTEL32::LINUX null
-osg-edu.cs.wisc.edu touch /bin/touch INSTALLED INTEL32::LINUX null
-UCLA_Saxon_Tier3 echo /bin/echo INSTALLED INTEL32::LINUX null
-UCLA_Saxon_Tier3 cat /bin/cat INSTALLED INTEL32::LINUX null
-UCLA_Saxon_Tier3 ls /bin/ls INSTALLED INTEL32::LINUX null
-UCLA_Saxon_Tier3 wc /bin/wc INSTALLED INTEL32::LINUX null
-UCLA_Saxon_Tier3 grep /bin/grep INSTALLED INTEL32::LINUX null
-UCLA_Saxon_Tier3 sort /bin/sort INSTALLED INTEL32::LINUX null
-UCLA_Saxon_Tier3 paste /bin/paste INSTALLED INTEL32::LINUX null
-UCLA_Saxon_Tier3 touch /bin/touch INSTALLED INTEL32::LINUX null
-tgtacc echo /bin/echo INSTALLED INTEL32::LINUX null
-tgtacc cat /bin/cat INSTALLED INTEL32::LINUX null
-tgtacc ls /bin/ls INSTALLED INTEL32::LINUX null
-tgtacc wc /bin/wc INSTALLED INTEL32::LINUX null
-tgtacc grep /bin/grep INSTALLED INTEL32::LINUX null
-tgtacc sort /bin/sort INSTALLED INTEL32::LINUX null
-tgtacc paste /bin/paste INSTALLED INTEL32::LINUX null
-tgtacc touch /bin/touch INSTALLED INTEL32::LINUX null
-tgncsa-hg echo /bin/echo INSTALLED INTEL32::LINUX null
-tgncsa-hg cat /bin/cat INSTALLED INTEL32::LINUX null
-tgncsa-hg ls /bin/ls INSTALLED INTEL32::LINUX null
-tgncsa-hg wc /bin/wc INSTALLED INTEL32::LINUX null
-tgncsa-hg grep /bin/grep INSTALLED INTEL32::LINUX null
-tgncsa-hg sort /bin/sort INSTALLED INTEL32::LINUX null
-tgncsa-hg paste /bin/paste INSTALLED INTEL32::LINUX null
-tgncsa-hg touch /bin/touch INSTALLED INTEL32::LINUX null
-tgpurdue echo /bin/echo INSTALLED INTEL32::LINUX null
-tgpurdue cat /bin/cat INSTALLED INTEL32::LINUX null
-tgpurdue ls /bin/ls INSTALLED INTEL32::LINUX null
-tgpurdue wc /bin/wc INSTALLED INTEL32::LINUX null
-tgpurdue grep /bin/grep INSTALLED INTEL32::LINUX null
-tgpurdue sort /bin/sort INSTALLED INTEL32::LINUX null
-tgpurdue paste /bin/paste INSTALLED INTEL32::LINUX null
-tgpurdue touch /bin/touch INSTALLED INTEL32::LINUX null
-localhost echo /bin/echo INSTALLED INTEL32::LINUX null
-localhost cat /bin/cat INSTALLED INTEL32::LINUX null
-localhost ls /bin/ls INSTALLED INTEL32::LINUX null
-localhost grep /bin/grep INSTALLED INTEL32::LINUX null
-localhost sort /bin/sort INSTALLED INTEL32::LINUX null
-localhost paste /bin/paste INSTALLED INTEL32::LINUX null
-renci-engage echo /bin/echo INSTALLED INTEL32::LINUX null
-renci-engage cat /bin/cat INSTALLED INTEL32::LINUX null
-renci-engage ls /bin/ls INSTALLED INTEL32::LINUX null
-renci-engage wc /bin/wc INSTALLED INTEL32::LINUX null
-renci-engage grep /bin/grep INSTALLED INTEL32::LINUX null
-renci-engage sort /bin/sort INSTALLED INTEL32::LINUX null
-renci-engage paste /bin/paste INSTALLED INTEL32::LINUX null
-renci-engage touch /bin/touch INSTALLED INTEL32::LINUX null
Copied: branches/release-0.93.1/tests/sites.old/tc.data (from rev 5504, branches/release-0.93/tests/sites.old/tc.data)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tc.data (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tc.data 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,81 @@
+#This is the transformation catalog.
+#
+#It comes pre-configured with a number of simple transformations with
+#paths that are likely to work on a linux box. However, on some systems,
+#the paths to these executables will be different (for example, sometimes
+#some of these programs are found in /usr/bin rather than in /bin)
+#
+#NOTE WELL: fields in this file must be separated by tabs, not spaces; and
+#there must be no trailing whitespace at the end of each line.
+#
+# sitename transformation path INSTALLED platform profiles
+teraport echo /bin/echo INSTALLED INTEL32::LINUX null
+teraport cat /bin/cat INSTALLED INTEL32::LINUX null
+teraport ls /bin/ls INSTALLED INTEL32::LINUX null
+teraport wc /bin/wc INSTALLED INTEL32::LINUX null
+teraport grep /bin/grep INSTALLED INTEL32::LINUX null
+teraport sort /bin/sort INSTALLED INTEL32::LINUX null
+teraport paste /bin/paste INSTALLED INTEL32::LINUX null
+teraport touch /bin/touch INSTALLED INTEL32::LINUX null
+tguc echo /bin/echo INSTALLED INTEL32::LINUX null
+tguc cat /bin/cat INSTALLED INTEL32::LINUX null
+tguc ls /bin/ls INSTALLED INTEL32::LINUX null
+tguc wc /bin/wc INSTALLED INTEL32::LINUX null
+tguc grep /bin/grep INSTALLED INTEL32::LINUX null
+tguc sort /bin/sort INSTALLED INTEL32::LINUX null
+tguc paste /bin/paste INSTALLED INTEL32::LINUX null
+tguc touch /bin/touch INSTALLED INTEL32::LINUX null
+osg-edu.cs.wisc.edu echo /bin/echo INSTALLED INTEL32::LINUX null
+osg-edu.cs.wisc.edu cat /bin/cat INSTALLED INTEL32::LINUX null
+osg-edu.cs.wisc.edu ls /bin/ls INSTALLED INTEL32::LINUX null
+osg-edu.cs.wisc.edu wc /bin/wc INSTALLED INTEL32::LINUX null
+osg-edu.cs.wisc.edu grep /bin/grep INSTALLED INTEL32::LINUX null
+osg-edu.cs.wisc.edu sort /bin/sort INSTALLED INTEL32::LINUX null
+osg-edu.cs.wisc.edu paste /bin/paste INSTALLED INTEL32::LINUX null
+osg-edu.cs.wisc.edu touch /bin/touch INSTALLED INTEL32::LINUX null
+UCLA_Saxon_Tier3 echo /bin/echo INSTALLED INTEL32::LINUX null
+UCLA_Saxon_Tier3 cat /bin/cat INSTALLED INTEL32::LINUX null
+UCLA_Saxon_Tier3 ls /bin/ls INSTALLED INTEL32::LINUX null
+UCLA_Saxon_Tier3 wc /bin/wc INSTALLED INTEL32::LINUX null
+UCLA_Saxon_Tier3 grep /bin/grep INSTALLED INTEL32::LINUX null
+UCLA_Saxon_Tier3 sort /bin/sort INSTALLED INTEL32::LINUX null
+UCLA_Saxon_Tier3 paste /bin/paste INSTALLED INTEL32::LINUX null
+UCLA_Saxon_Tier3 touch /bin/touch INSTALLED INTEL32::LINUX null
+tgtacc echo /bin/echo INSTALLED INTEL32::LINUX null
+tgtacc cat /bin/cat INSTALLED INTEL32::LINUX null
+tgtacc ls /bin/ls INSTALLED INTEL32::LINUX null
+tgtacc wc /bin/wc INSTALLED INTEL32::LINUX null
+tgtacc grep /bin/grep INSTALLED INTEL32::LINUX null
+tgtacc sort /bin/sort INSTALLED INTEL32::LINUX null
+tgtacc paste /bin/paste INSTALLED INTEL32::LINUX null
+tgtacc touch /bin/touch INSTALLED INTEL32::LINUX null
+tgncsa-hg echo /bin/echo INSTALLED INTEL32::LINUX null
+tgncsa-hg cat /bin/cat INSTALLED INTEL32::LINUX null
+tgncsa-hg ls /bin/ls INSTALLED INTEL32::LINUX null
+tgncsa-hg wc /bin/wc INSTALLED INTEL32::LINUX null
+tgncsa-hg grep /bin/grep INSTALLED INTEL32::LINUX null
+tgncsa-hg sort /bin/sort INSTALLED INTEL32::LINUX null
+tgncsa-hg paste /bin/paste INSTALLED INTEL32::LINUX null
+tgncsa-hg touch /bin/touch INSTALLED INTEL32::LINUX null
+tgpurdue echo /bin/echo INSTALLED INTEL32::LINUX null
+tgpurdue cat /bin/cat INSTALLED INTEL32::LINUX null
+tgpurdue ls /bin/ls INSTALLED INTEL32::LINUX null
+tgpurdue wc /bin/wc INSTALLED INTEL32::LINUX null
+tgpurdue grep /bin/grep INSTALLED INTEL32::LINUX null
+tgpurdue sort /bin/sort INSTALLED INTEL32::LINUX null
+tgpurdue paste /bin/paste INSTALLED INTEL32::LINUX null
+tgpurdue touch /bin/touch INSTALLED INTEL32::LINUX null
+localhost echo /bin/echo INSTALLED INTEL32::LINUX null
+localhost cat /bin/cat INSTALLED INTEL32::LINUX null
+localhost ls /bin/ls INSTALLED INTEL32::LINUX null
+localhost grep /bin/grep INSTALLED INTEL32::LINUX null
+localhost sort /bin/sort INSTALLED INTEL32::LINUX null
+localhost paste /bin/paste INSTALLED INTEL32::LINUX null
+renci-engage echo /bin/echo INSTALLED INTEL32::LINUX null
+renci-engage cat /bin/cat INSTALLED INTEL32::LINUX null
+renci-engage ls /bin/ls INSTALLED INTEL32::LINUX null
+renci-engage wc /bin/wc INSTALLED INTEL32::LINUX null
+renci-engage grep /bin/grep INSTALLED INTEL32::LINUX null
+renci-engage sort /bin/sort INSTALLED INTEL32::LINUX null
+renci-engage paste /bin/paste INSTALLED INTEL32::LINUX null
+renci-engage touch /bin/touch INSTALLED INTEL32::LINUX null
Deleted: branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-fork-gram2.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tg-login.uc.teragrid.org/tguc-fork-gram2.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-fork-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="tguc" >
-<gridftp url="local://localhost" />
- <jobmanager universe="vanilla" url="tg-grid.uc.teragrid.org/jobmanager-fork" major="2" />
- <workdirectory >/home/benc</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-fork-gram2.xml (from rev 5504, branches/release-0.93/tests/sites.old/tg-login.uc.teragrid.org/tguc-fork-gram2.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-fork-gram2.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-fork-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="tguc" >
+<gridftp url="local://localhost" />
+ <jobmanager universe="vanilla" url="tg-grid.uc.teragrid.org/jobmanager-fork" major="2" />
+ <workdirectory >/home/benc</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-fork-gram4.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tg-login.uc.teragrid.org/tguc-fork-gram4.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-fork-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="tguc" >
-<gridftp url="local://localhost" />
-<execution provider="gt4" jobmanager="Fork" url="tg-grid.uc.teragrid.org" />
- <workdirectory >/home/benc</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-fork-gram4.xml (from rev 5504, branches/release-0.93/tests/sites.old/tg-login.uc.teragrid.org/tguc-fork-gram4.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-fork-gram4.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-fork-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="tguc" >
+<gridftp url="local://localhost" />
+<execution provider="gt4" jobmanager="Fork" url="tg-grid.uc.teragrid.org" />
+ <workdirectory >/home/benc</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-gram2.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-gram2.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,10 +0,0 @@
-<config>
-
- <pool handle="tguc" >
-<gridftp url="local://localhost" />
- <jobmanager universe="vanilla" url="tg-grid.uc.teragrid.org/jobmanager-pbs" major="2" />
- <workdirectory >/home/benc</workdirectory>
- <profile namespace="globus" key="project">TG-CCR080002N</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-gram2.xml (from rev 5504, branches/release-0.93/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-gram2.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-gram2.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,10 @@
+<config>
+
+ <pool handle="tguc" >
+<gridftp url="local://localhost" />
+ <jobmanager universe="vanilla" url="tg-grid.uc.teragrid.org/jobmanager-pbs" major="2" />
+ <workdirectory >/home/benc</workdirectory>
+ <profile namespace="globus" key="project">TG-CCR080002N</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-gram4.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-gram4.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,10 +0,0 @@
-<config>
-
- <pool handle="tguc" >
-<gridftp url="local://localhost" />
-<execution provider="gt4" jobmanager="PBS" url="tg-grid.uc.teragrid.org" />
- <workdirectory >/home/benc</workdirectory>
- <profile namespace="globus" key="project">TG-CCR080002N</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-gram4.xml (from rev 5504, branches/release-0.93/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-gram4.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-gram4.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,10 @@
+<config>
+
+ <pool handle="tguc" >
+<gridftp url="local://localhost" />
+<execution provider="gt4" jobmanager="PBS" url="tg-grid.uc.teragrid.org" />
+ <workdirectory >/home/benc</workdirectory>
+ <profile namespace="globus" key="project">TG-CCR080002N</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-local.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-local.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-local.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,12 +0,0 @@
-<config>
-
- <pool handle="tguc" >
-<gridftp url="local://localhost" />
-<execution provider="pbs" url="none" />
-
- <workdirectory >/home/benc</workdirectory>
- <profile namespace="globus" key="project">TG-CCR080002N</profile>
- </pool>
-
-</config>
-
Copied: branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-local.xml (from rev 5504, branches/release-0.93/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-local.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-local.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tg-login.uc.teragrid.org/tguc-pbs-local.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,12 @@
+<config>
+
+ <pool handle="tguc" >
+<gridftp url="local://localhost" />
+<execution provider="pbs" url="none" />
+
+ <workdirectory >/home/benc</workdirectory>
+ <profile namespace="globus" key="project">TG-CCR080002N</profile>
+ </pool>
+
+</config>
+
Deleted: branches/release-0.93.1/tests/sites.old/tgncsa-hg-fork-gram2.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tgncsa-hg-fork-gram2.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tgncsa-hg-fork-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="tgncsa-hg" >
- <gridftp url="gsiftp://gt2-gridftp-hg.ncsa.teragrid.org" />
- <jobmanager universe="vanilla" url="grid-hg.ncsa.teragrid.org/jobmanager-fork" major="2" />
- <workdirectory >/home/ac/benc/swifttest</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tgncsa-hg-fork-gram2.xml (from rev 5504, branches/release-0.93/tests/sites.old/tgncsa-hg-fork-gram2.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tgncsa-hg-fork-gram2.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tgncsa-hg-fork-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="tgncsa-hg" >
+ <gridftp url="gsiftp://gt2-gridftp-hg.ncsa.teragrid.org" />
+ <jobmanager universe="vanilla" url="grid-hg.ncsa.teragrid.org/jobmanager-fork" major="2" />
+ <workdirectory >/home/ac/benc/swifttest</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tgncsa-hg-fork-gram4.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tgncsa-hg-fork-gram4.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tgncsa-hg-fork-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="tgncsa-hg" >
- <gridftp url="gsiftp://gt2-gridftp-hg.ncsa.teragrid.org" />
- <execution provider="gt4" url="grid-hg.ncsa.teragrid.org" jobManager="Fork" />
- <workdirectory >/home/ac/benc/swifttest</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tgncsa-hg-fork-gram4.xml (from rev 5504, branches/release-0.93/tests/sites.old/tgncsa-hg-fork-gram4.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tgncsa-hg-fork-gram4.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tgncsa-hg-fork-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="tgncsa-hg" >
+ <gridftp url="gsiftp://gt2-gridftp-hg.ncsa.teragrid.org" />
+ <execution provider="gt4" url="grid-hg.ncsa.teragrid.org" jobManager="Fork" />
+ <workdirectory >/home/ac/benc/swifttest</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tgncsa-hg-pbs-gram2.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tgncsa-hg-pbs-gram2.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tgncsa-hg-pbs-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,10 +0,0 @@
-<config>
-
- <pool handle="tgncsa-hg" >
- <gridftp url="gsiftp://gt2-gridftp-hg.ncsa.teragrid.org" />
- <jobmanager universe="vanilla" url="grid-hg.ncsa.teragrid.org/jobmanager-pbs" major="2" />
- <workdirectory >/home/ac/benc/swifttest</workdirectory>
- <profile namespace="globus" key="project">TG-CCR080002N</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tgncsa-hg-pbs-gram2.xml (from rev 5504, branches/release-0.93/tests/sites.old/tgncsa-hg-pbs-gram2.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tgncsa-hg-pbs-gram2.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tgncsa-hg-pbs-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,10 @@
+<config>
+
+ <pool handle="tgncsa-hg" >
+ <gridftp url="gsiftp://gt2-gridftp-hg.ncsa.teragrid.org" />
+ <jobmanager universe="vanilla" url="grid-hg.ncsa.teragrid.org/jobmanager-pbs" major="2" />
+ <workdirectory >/home/ac/benc/swifttest</workdirectory>
+ <profile namespace="globus" key="project">TG-CCR080002N</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tgncsa-hg-pbs-gram4.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tgncsa-hg-pbs-gram4.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tgncsa-hg-pbs-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,11 +0,0 @@
-<config>
-
- <pool handle="tgncsa-hg" >
- <gridftp url="gsiftp://gt2-gridftp-hg.ncsa.teragrid.org" />
- <execution provider="gt4" url="grid-hg.ncsa.teragrid.org" jobManager="PBS" />
- <workdirectory >/home/ac/benc/swifttest</workdirectory>
- <profile namespace="globus" key="project">TG-CCR080002N</profile>
- <profile namespace="karajan" key="jobThrottle">4</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tgncsa-hg-pbs-gram4.xml (from rev 5504, branches/release-0.93/tests/sites.old/tgncsa-hg-pbs-gram4.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tgncsa-hg-pbs-gram4.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tgncsa-hg-pbs-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,11 @@
+<config>
+
+ <pool handle="tgncsa-hg" >
+ <gridftp url="gsiftp://gt2-gridftp-hg.ncsa.teragrid.org" />
+ <execution provider="gt4" url="grid-hg.ncsa.teragrid.org" jobManager="PBS" />
+ <workdirectory >/home/ac/benc/swifttest</workdirectory>
+ <profile namespace="globus" key="project">TG-CCR080002N</profile>
+ <profile namespace="karajan" key="jobThrottle">4</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tgpurdue-condor-gram2.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tgpurdue-condor-gram2.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tgpurdue-condor-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,11 +0,0 @@
-<config>
-
- <pool handle="tgpurdue" >
- <gridftp url="gsiftp://tg-data.purdue.teragrid.org" />
- <jobmanager universe="vanilla" url="tg-condor.purdue.teragrid.org/jobmanager-condor" major="2" />
- <workdirectory >/autohome/u102/benc/swifttest</workdirectory>
- <profile namespace="globus" key="project">TG-CCR080002N</profile>
-
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tgpurdue-condor-gram2.xml (from rev 5504, branches/release-0.93/tests/sites.old/tgpurdue-condor-gram2.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tgpurdue-condor-gram2.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tgpurdue-condor-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,11 @@
+<config>
+
+ <pool handle="tgpurdue" >
+ <gridftp url="gsiftp://tg-data.purdue.teragrid.org" />
+ <jobmanager universe="vanilla" url="tg-condor.purdue.teragrid.org/jobmanager-condor" major="2" />
+ <workdirectory >/autohome/u102/benc/swifttest</workdirectory>
+ <profile namespace="globus" key="project">TG-CCR080002N</profile>
+
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tgpurdue-condor-gram4.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tgpurdue-condor-gram4.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tgpurdue-condor-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,11 +0,0 @@
-<config>
-
- <pool handle="tgpurdue" >
- <gridftp url="gsiftp://tg-data.purdue.teragrid.org" />
- <execution url="https://tg-condor.purdue.teragrid.org:8443/wsrf/services/ManagedJobFactoryService" jobManager="Condor" provider="gt4" />
- <workdirectory >/autohome/u102/benc/swifttest</workdirectory>
- <profile namespace="globus" key="project">TG-CCR080002N</profile>
-
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tgpurdue-condor-gram4.xml (from rev 5504, branches/release-0.93/tests/sites.old/tgpurdue-condor-gram4.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tgpurdue-condor-gram4.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tgpurdue-condor-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,11 @@
+<config>
+
+ <pool handle="tgpurdue" >
+ <gridftp url="gsiftp://tg-data.purdue.teragrid.org" />
+ <execution url="https://tg-condor.purdue.teragrid.org:8443/wsrf/services/ManagedJobFactoryService" jobManager="Condor" provider="gt4" />
+ <workdirectory >/autohome/u102/benc/swifttest</workdirectory>
+ <profile namespace="globus" key="project">TG-CCR080002N</profile>
+
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tgpurdue-fork-gram2.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tgpurdue-fork-gram2.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tgpurdue-fork-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="tgpurdue" >
- <gridftp url="gsiftp://tg-data.purdue.teragrid.org" />
- <jobmanager universe="vanilla" url="tg-steele.purdue.teragrid.org/jobmanager-fork" major="2" />
- <workdirectory >/autohome/u102/benc/swifttest</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tgpurdue-fork-gram2.xml (from rev 5504, branches/release-0.93/tests/sites.old/tgpurdue-fork-gram2.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tgpurdue-fork-gram2.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tgpurdue-fork-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="tgpurdue" >
+ <gridftp url="gsiftp://tg-data.purdue.teragrid.org" />
+ <jobmanager universe="vanilla" url="tg-steele.purdue.teragrid.org/jobmanager-fork" major="2" />
+ <workdirectory >/autohome/u102/benc/swifttest</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tgpurdue-fork-gram4.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tgpurdue-fork-gram4.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tgpurdue-fork-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,10 +0,0 @@
-<config>
-
- <pool handle="tgpurdue" >
- <gridftp url="gsiftp://tg-data.purdue.teragrid.org" />
- <execution url="https://tg-condor.purdue.teragrid.org:8443/wsrf/services/ManagedJobFactoryService" jobManager="Fork" provider="gt4" />
- <workdirectory >/autohome/u102/benc/swifttest</workdirectory>
-
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tgpurdue-fork-gram4.xml (from rev 5504, branches/release-0.93/tests/sites.old/tgpurdue-fork-gram4.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tgpurdue-fork-gram4.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tgpurdue-fork-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,10 @@
+<config>
+
+ <pool handle="tgpurdue" >
+ <gridftp url="gsiftp://tg-data.purdue.teragrid.org" />
+ <execution url="https://tg-condor.purdue.teragrid.org:8443/wsrf/services/ManagedJobFactoryService" jobManager="Fork" provider="gt4" />
+ <workdirectory >/autohome/u102/benc/swifttest</workdirectory>
+
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tgtacc-fork-gram2.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tgtacc-fork-gram2.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tgtacc-fork-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="tgtacc" >
- <gridftp url="gsiftp://tg-viz-login.tacc.teragrid.org" />
- <jobmanager universe="vanilla" url="tg-viz-login.tacc.teragrid.org/jobmanager-fork" major="2" />
- <workdirectory >/home/teragrid/tg458015/swifttest</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tgtacc-fork-gram2.xml (from rev 5504, branches/release-0.93/tests/sites.old/tgtacc-fork-gram2.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tgtacc-fork-gram2.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tgtacc-fork-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="tgtacc" >
+ <gridftp url="gsiftp://tg-viz-login.tacc.teragrid.org" />
+ <jobmanager universe="vanilla" url="tg-viz-login.tacc.teragrid.org/jobmanager-fork" major="2" />
+ <workdirectory >/home/teragrid/tg458015/swifttest</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tgtacc-lsf-gram2.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tgtacc-lsf-gram2.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tgtacc-lsf-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,11 +0,0 @@
-<config>
-
- <pool handle="tgtacc" >
- <gridftp url="gsiftp://tg-login.tacc.teragrid.org" />
- <jobmanager universe="vanilla" url="tg-login.tacc.teragrid.org:2119/jobmanager-lsf" major="2" />
- <workdirectory >/home/teragrid/tg458015/swifttest</workdirectory>
- <profile namespace="globus" key="queue">development</profile>
- <profile namespace="globus" key="maxwalltime">1</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tgtacc-lsf-gram2.xml (from rev 5504, branches/release-0.93/tests/sites.old/tgtacc-lsf-gram2.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tgtacc-lsf-gram2.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tgtacc-lsf-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,11 @@
+<config>
+
+ <pool handle="tgtacc" >
+ <gridftp url="gsiftp://tg-login.tacc.teragrid.org" />
+ <jobmanager universe="vanilla" url="tg-login.tacc.teragrid.org:2119/jobmanager-lsf" major="2" />
+ <workdirectory >/home/teragrid/tg458015/swifttest</workdirectory>
+ <profile namespace="globus" key="queue">development</profile>
+ <profile namespace="globus" key="maxwalltime">1</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tguc-fork-gram2.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tguc-fork-gram2.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tguc-fork-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="tguc" >
- <gridftp url="gsiftp://tg-gridftp.uc.teragrid.org" />
- <jobmanager universe="vanilla" url="tg-grid.uc.teragrid.org/jobmanager-fork" major="2" />
- <workdirectory >/home/benc/swifttest</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tguc-fork-gram2.xml (from rev 5504, branches/release-0.93/tests/sites.old/tguc-fork-gram2.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tguc-fork-gram2.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tguc-fork-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="tguc" >
+ <gridftp url="gsiftp://tg-gridftp.uc.teragrid.org" />
+ <jobmanager universe="vanilla" url="tg-grid.uc.teragrid.org/jobmanager-fork" major="2" />
+ <workdirectory >/home/benc/swifttest</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tguc-fork-gram4.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tguc-fork-gram4.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tguc-fork-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="tguc" >
- <gridftp url="gsiftp://tg-gridftp.uc.teragrid.org" />
-<execution provider="gt4" jobmanager="Fork" url="tg-grid.uc.teragrid.org" />
- <workdirectory >/home/benc/swifttest</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tguc-fork-gram4.xml (from rev 5504, branches/release-0.93/tests/sites.old/tguc-fork-gram4.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tguc-fork-gram4.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tguc-fork-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="tguc" >
+ <gridftp url="gsiftp://tg-gridftp.uc.teragrid.org" />
+<execution provider="gt4" jobmanager="Fork" url="tg-grid.uc.teragrid.org" />
+ <workdirectory >/home/benc/swifttest</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tguc-pbs-gram2-syntax1.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tguc-pbs-gram2-syntax1.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tguc-pbs-gram2-syntax1.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,10 +0,0 @@
-<config>
-
- <pool handle="tguc" >
- <gridftp url="gsiftp://tg-gridftp.uc.teragrid.org" />
- <execution provider="gt2" url="tg-grid.uc.teragrid.org" jobmanager="pbs" />
- <workdirectory >/home/benc/swifttest</workdirectory>
- <profile namespace="globus" key="project">TG-CCR080002N</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tguc-pbs-gram2-syntax1.xml (from rev 5504, branches/release-0.93/tests/sites.old/tguc-pbs-gram2-syntax1.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tguc-pbs-gram2-syntax1.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tguc-pbs-gram2-syntax1.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,10 @@
+<config>
+
+ <pool handle="tguc" >
+ <gridftp url="gsiftp://tg-gridftp.uc.teragrid.org" />
+ <execution provider="gt2" url="tg-grid.uc.teragrid.org" jobmanager="pbs" />
+ <workdirectory >/home/benc/swifttest</workdirectory>
+ <profile namespace="globus" key="project">TG-CCR080002N</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tguc-pbs-gram2.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tguc-pbs-gram2.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tguc-pbs-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,10 +0,0 @@
-<config>
-
- <pool handle="tguc" >
- <gridftp url="gsiftp://tg-gridftp.uc.teragrid.org" />
- <jobmanager universe="vanilla" url="tg-grid.uc.teragrid.org/jobmanager-pbs" major="2" />
- <profile namespace="globus" key="project">TG-DBS080005N</profile>
- <workdirectory >/home/benc/swifttest</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tguc-pbs-gram2.xml (from rev 5504, branches/release-0.93/tests/sites.old/tguc-pbs-gram2.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tguc-pbs-gram2.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tguc-pbs-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,10 @@
+<config>
+
+ <pool handle="tguc" >
+ <gridftp url="gsiftp://tg-gridftp.uc.teragrid.org" />
+ <jobmanager universe="vanilla" url="tg-grid.uc.teragrid.org/jobmanager-pbs" major="2" />
+ <profile namespace="globus" key="project">TG-DBS080005N</profile>
+ <workdirectory >/home/benc/swifttest</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tguc-pbs-gram4.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tguc-pbs-gram4.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tguc-pbs-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,11 +0,0 @@
-<config>
-
- <pool handle="tguc" >
- <gridftp url="gsiftp://tg-gridftp.uc.teragrid.org" />
-<execution provider="gt4" jobmanager="PBS" url="tg-grid.uc.teragrid.org" />
- <workdirectory >/home/benc/swifttest</workdirectory>
- <profile namespace="globus" key="project">TG-CCR080002N</profile>
- <profile namespace="karajan" key="jobThrottle">4</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tguc-pbs-gram4.xml (from rev 5504, branches/release-0.93/tests/sites.old/tguc-pbs-gram4.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tguc-pbs-gram4.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tguc-pbs-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,11 @@
+<config>
+
+ <pool handle="tguc" >
+ <gridftp url="gsiftp://tg-gridftp.uc.teragrid.org" />
+<execution provider="gt4" jobmanager="PBS" url="tg-grid.uc.teragrid.org" />
+ <workdirectory >/home/benc/swifttest</workdirectory>
+ <profile namespace="globus" key="project">TG-CCR080002N</profile>
+ <profile namespace="karajan" key="jobThrottle">4</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tp-fork-gram2.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tp-fork-gram2.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tp-fork-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,10 +0,0 @@
-<config>
-
- <pool handle="teraport" >
- <gridftp url="gsiftp://tp-osg.ci.uchicago.edu" />
- <jobmanager universe="vanilla" url="tp-osg.ci.uchicago.edu/jobmanager-fork" major="2" />
- <workdirectory >/home/benc/swifttest</workdirectory>
-<profile namespace="env" key="fang">YES</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tp-fork-gram2.xml (from rev 5504, branches/release-0.93/tests/sites.old/tp-fork-gram2.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tp-fork-gram2.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tp-fork-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,10 @@
+<config>
+
+ <pool handle="teraport" >
+ <gridftp url="gsiftp://tp-osg.ci.uchicago.edu" />
+ <jobmanager universe="vanilla" url="tp-osg.ci.uchicago.edu/jobmanager-fork" major="2" />
+ <workdirectory >/home/benc/swifttest</workdirectory>
+<profile namespace="env" key="fang">YES</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tp-fork-gram4.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tp-fork-gram4.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tp-fork-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="teraport" >
- <gridftp url="gsiftp://tp-osg.ci.uchicago.edu" />
- <execution provider="gt4" url="tp-grid1.ci.uchicago.edu:9443" jobmanager="Fork" />
- <workdirectory >/home/benc/swifttest</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tp-fork-gram4.xml (from rev 5504, branches/release-0.93/tests/sites.old/tp-fork-gram4.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tp-fork-gram4.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tp-fork-gram4.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="teraport" >
+ <gridftp url="gsiftp://tp-osg.ci.uchicago.edu" />
+ <execution provider="gt4" url="tp-grid1.ci.uchicago.edu:9443" jobmanager="Fork" />
+ <workdirectory >/home/benc/swifttest</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/tp-pbs-gram2.xml
===================================================================
--- branches/release-0.93/tests/sites.old/tp-pbs-gram2.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/tp-pbs-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,10 +0,0 @@
-<config>
-
- <pool handle="teraport" >
- <gridftp url="gsiftp://tp-osg.ci.uchicago.edu" />
- <jobmanager universe="vanilla" url="tp-osg.ci.uchicago.edu/jobmanager-pbs" major="2" />
- <profile namespace="globus" key="queue">test</profile>
- <workdirectory >/home/benc/swifttest</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/tp-pbs-gram2.xml (from rev 5504, branches/release-0.93/tests/sites.old/tp-pbs-gram2.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/tp-pbs-gram2.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/tp-pbs-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,10 @@
+<config>
+
+ <pool handle="teraport" >
+ <gridftp url="gsiftp://tp-osg.ci.uchicago.edu" />
+ <jobmanager universe="vanilla" url="tp-osg.ci.uchicago.edu/jobmanager-pbs" major="2" />
+ <profile namespace="globus" key="queue">test</profile>
+ <workdirectory >/home/benc/swifttest</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/uj-fork-gram2.xml
===================================================================
--- branches/release-0.93/tests/sites.old/uj-fork-gram2.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/uj-fork-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="teraport" >
- <gridftp url="gsiftp://osg-ce.grid.uj.ac.za" />
- <jobmanager universe="vanilla" url="osg-ce.grid.uj.ac.za/jobmanager-fork" major="2" />
- <workdirectory >/nfs/home/benc/swifttest</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/uj-fork-gram2.xml (from rev 5504, branches/release-0.93/tests/sites.old/uj-fork-gram2.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/uj-fork-gram2.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/uj-fork-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="teraport" >
+ <gridftp url="gsiftp://osg-ce.grid.uj.ac.za" />
+ <jobmanager universe="vanilla" url="osg-ce.grid.uj.ac.za/jobmanager-fork" major="2" />
+ <workdirectory >/nfs/home/benc/swifttest</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/uj-pbs-gram2.xml
===================================================================
--- branches/release-0.93/tests/sites.old/uj-pbs-gram2.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/uj-pbs-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,9 +0,0 @@
-<config>
-
- <pool handle="teraport" >
- <gridftp url="gsiftp://osg-ce.grid.uj.ac.za" />
- <jobmanager universe="vanilla" url="osg-ce.grid.uj.ac.za/jobmanager-pbs" major="2" />
- <workdirectory >/nfs/home/benc/swifttest</workdirectory>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/uj-pbs-gram2.xml (from rev 5504, branches/release-0.93/tests/sites.old/uj-pbs-gram2.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/uj-pbs-gram2.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/uj-pbs-gram2.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,9 @@
+<config>
+
+ <pool handle="teraport" >
+ <gridftp url="gsiftp://osg-ce.grid.uj.ac.za" />
+ <jobmanager universe="vanilla" url="osg-ce.grid.uj.ac.za/jobmanager-pbs" major="2" />
+ <workdirectory >/nfs/home/benc/swifttest</workdirectory>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/wonky/relative-absolute-wrapper.xml
===================================================================
--- branches/release-0.93/tests/sites.old/wonky/relative-absolute-wrapper.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/wonky/relative-absolute-wrapper.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,19 +0,0 @@
-<config>
-
- <pool handle="wonkyA">
- <gridftp url="local://localhost" />
- <execution provider="local" url="none" />
- <workdirectory >/var/tmp/swift-test/A</workdirectory>
- <profile namespace="karajan" key="jobThrottle">0</profile>
- </pool>
-
-
- <pool handle="wonkyB">
- <gridftp url="local://localhost" />
- <execution provider="wonky" url="good/wrongdirectory" />
- <workdirectory >/var/tmp/swift-test/B</workdirectory>
- <profile namespace="karajan" key="jobThrottle">0</profile>
- <profile namespace="karajan" key="wrapper.invocation.mode">absolute</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/wonky/relative-absolute-wrapper.xml (from rev 5504, branches/release-0.93/tests/sites.old/wonky/relative-absolute-wrapper.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/wonky/relative-absolute-wrapper.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/wonky/relative-absolute-wrapper.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,19 @@
+<config>
+
+ <pool handle="wonkyA">
+ <gridftp url="local://localhost" />
+ <execution provider="local" url="none" />
+ <workdirectory >/var/tmp/swift-test/A</workdirectory>
+ <profile namespace="karajan" key="jobThrottle">0</profile>
+ </pool>
+
+
+ <pool handle="wonkyB">
+ <gridftp url="local://localhost" />
+ <execution provider="wonky" url="good/wrongdirectory" />
+ <workdirectory >/var/tmp/swift-test/B</workdirectory>
+ <profile namespace="karajan" key="jobThrottle">0</profile>
+ <profile namespace="karajan" key="wrapper.invocation.mode">absolute</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/wonky/slow-queue-fast-queue.xml
===================================================================
--- branches/release-0.93/tests/sites.old/wonky/slow-queue-fast-queue.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/wonky/slow-queue-fast-queue.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,18 +0,0 @@
-<config>
-
- <pool handle="wonkyA">
- <gridftp url="local://localhost" />
- <execution provider="wonky" url="good/activefail=0/activedelay=0" />
- <workdirectory >/var/tmp</workdirectory>
- <profile namespace="karajan" key="jobThrottle">4</profile>
- </pool>
-
- <pool handle="wonkyB">
- <gridftp url="local://localhost" />
- <execution provider="wonky" url="bad/activefail=0/activedelay=0/qmean=600/qstddev=60" />
- <workdirectory >/var/tmp</workdirectory>
- <profile namespace="karajan" key="jobThrottle">4</profile>
- </pool>
-
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/wonky/slow-queue-fast-queue.xml (from rev 5504, branches/release-0.93/tests/sites.old/wonky/slow-queue-fast-queue.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/wonky/slow-queue-fast-queue.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/wonky/slow-queue-fast-queue.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,18 @@
+<config>
+
+ <pool handle="wonkyA">
+ <gridftp url="local://localhost" />
+ <execution provider="wonky" url="good/activefail=0/activedelay=0" />
+ <workdirectory >/var/tmp</workdirectory>
+ <profile namespace="karajan" key="jobThrottle">4</profile>
+ </pool>
+
+ <pool handle="wonkyB">
+ <gridftp url="local://localhost" />
+ <execution provider="wonky" url="bad/activefail=0/activedelay=0/qmean=600/qstddev=60" />
+ <workdirectory >/var/tmp</workdirectory>
+ <profile namespace="karajan" key="jobThrottle">4</profile>
+ </pool>
+
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/wonky/wonky-80percent.xml
===================================================================
--- branches/release-0.93/tests/sites.old/wonky/wonky-80percent.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/wonky/wonky-80percent.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,11 +0,0 @@
-<config>
-
- <pool handle="localhost">
- <gridftp url="local://localhost" />
- <execution provider="wonky" url="good/activefail=0.2/activedelay=0" />
- <workdirectory >/var/tmp</workdirectory>
- <profile namespace="karajan" key="jobThrottle">0</profile>
- <profile namespace="karajan" key="delayBase">0</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/wonky/wonky-80percent.xml (from rev 5504, branches/release-0.93/tests/sites.old/wonky/wonky-80percent.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/wonky/wonky-80percent.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/wonky/wonky-80percent.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,11 @@
+<config>
+
+ <pool handle="localhost">
+ <gridftp url="local://localhost" />
+ <execution provider="wonky" url="good/activefail=0.2/activedelay=0" />
+ <workdirectory >/var/tmp</workdirectory>
+ <profile namespace="karajan" key="jobThrottle">0</profile>
+ <profile namespace="karajan" key="delayBase">0</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/wonky/wonky-90percent.xml
===================================================================
--- branches/release-0.93/tests/sites.old/wonky/wonky-90percent.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/wonky/wonky-90percent.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,10 +0,0 @@
-<config>
-
- <pool handle="localhost">
- <gridftp url="local://localhost" />
- <execution provider="wonky" url="good/activefail=0.1/activedelay=0" />
- <workdirectory >/var/tmp</workdirectory>
- <profile namespace="karajan" key="jobThrottle">0</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/wonky/wonky-90percent.xml (from rev 5504, branches/release-0.93/tests/sites.old/wonky/wonky-90percent.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/wonky/wonky-90percent.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/wonky/wonky-90percent.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,10 @@
+<config>
+
+ <pool handle="localhost">
+ <gridftp url="local://localhost" />
+ <execution provider="wonky" url="good/activefail=0.1/activedelay=0" />
+ <workdirectory >/var/tmp</workdirectory>
+ <profile namespace="karajan" key="jobThrottle">0</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/wonky/wonky-failfirst.xml
===================================================================
--- branches/release-0.93/tests/sites.old/wonky/wonky-failfirst.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/wonky/wonky-failfirst.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,11 +0,0 @@
-<config>
-
- <pool handle="localhost">
- <gridftp url="local://localhost" />
- <execution provider="wonky" url="ff/activefailfirstcount=2" />
- <workdirectory >/var/tmp</workdirectory>
- <profile namespace="karajan" key="jobThrottle">0</profile>
- <profile namespace="karajan" key="delayBase">0</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/wonky/wonky-failfirst.xml (from rev 5504, branches/release-0.93/tests/sites.old/wonky/wonky-failfirst.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/wonky/wonky-failfirst.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/wonky/wonky-failfirst.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,11 @@
+<config>
+
+ <pool handle="localhost">
+ <gridftp url="local://localhost" />
+ <execution provider="wonky" url="ff/activefailfirstcount=2" />
+ <workdirectory >/var/tmp</workdirectory>
+ <profile namespace="karajan" key="jobThrottle">0</profile>
+ <profile namespace="karajan" key="delayBase">0</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/wonky/wonky-good.xml
===================================================================
--- branches/release-0.93/tests/sites.old/wonky/wonky-good.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/wonky/wonky-good.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,10 +0,0 @@
-<config>
-
- <pool handle="localhost">
- <gridftp url="local://localhost" />
- <execution provider="wonky" url="good/activefail=0/activedelay=5" />
- <workdirectory >/var/tmp</workdirectory>
- <profile namespace="karajan" key="jobThrottle">0</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/wonky/wonky-good.xml (from rev 5504, branches/release-0.93/tests/sites.old/wonky/wonky-good.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/wonky/wonky-good.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/wonky/wonky-good.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,10 @@
+<config>
+
+ <pool handle="localhost">
+ <gridftp url="local://localhost" />
+ <execution provider="wonky" url="good/activefail=0/activedelay=5" />
+ <workdirectory >/var/tmp</workdirectory>
+ <profile namespace="karajan" key="jobThrottle">0</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/wonky/wonky-runawayjob.xml
===================================================================
--- branches/release-0.93/tests/sites.old/wonky/wonky-runawayjob.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/wonky/wonky-runawayjob.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,11 +0,0 @@
-<config>
-
- <pool handle="localhost">
- <gridftp url="local://localhost" />
- <execution provider="wonky" url="runawayjob" />
- <workdirectory >/var/tmp</workdirectory>
- <profile namespace="karajan" key="jobThrottle">0</profile>
- <profile namespace="karajan" key="delayBase">0</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/wonky/wonky-runawayjob.xml (from rev 5504, branches/release-0.93/tests/sites.old/wonky/wonky-runawayjob.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/wonky/wonky-runawayjob.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/wonky/wonky-runawayjob.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,11 @@
+<config>
+
+ <pool handle="localhost">
+ <gridftp url="local://localhost" />
+ <execution provider="wonky" url="runawayjob" />
+ <workdirectory >/var/tmp</workdirectory>
+ <profile namespace="karajan" key="jobThrottle">0</profile>
+ <profile namespace="karajan" key="delayBase">0</profile>
+ </pool>
+
+</config>
Deleted: branches/release-0.93.1/tests/sites.old/wonky/wrongdir.xml
===================================================================
--- branches/release-0.93/tests/sites.old/wonky/wrongdir.xml 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/sites.old/wonky/wrongdir.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -1,11 +0,0 @@
-<config>
-
- <pool handle="localhost">
- <gridftp url="local://localhost" />
- <execution provider="wonky" url="wd/wrongdirectory" />
- <workdirectory >/var/tmp</workdirectory>
- <profile namespace="karajan" key="jobThrottle">0</profile>
- <profile namespace="karajan" key="delayBase">0</profile>
- </pool>
-
-</config>
Copied: branches/release-0.93.1/tests/sites.old/wonky/wrongdir.xml (from rev 5504, branches/release-0.93/tests/sites.old/wonky/wrongdir.xml)
===================================================================
--- branches/release-0.93.1/tests/sites.old/wonky/wrongdir.xml (rev 0)
+++ branches/release-0.93.1/tests/sites.old/wonky/wrongdir.xml 2012-01-22 03:23:13 UTC (rev 5505)
@@ -0,0 +1,11 @@
+<config>
+
+ <pool handle="localhost">
+ <gridftp url="local://localhost" />
+ <execution provider="wonky" url="wd/wrongdirectory" />
+ <workdirectory >/var/tmp</workdirectory>
+ <profile namespace="karajan" key="jobThrottle">0</profile>
+ <profile namespace="karajan" key="delayBase">0</profile>
+ </pool>
+
+</config>
Modified: branches/release-0.93.1/tests/suite.sh
===================================================================
--- branches/release-0.93.1/tests/suite.sh 2012-01-20 22:57:44 UTC (rev 5504)
+++ branches/release-0.93.1/tests/suite.sh 2012-01-22 03:23:13 UTC (rev 5505)
@@ -34,9 +34,11 @@
TOTAL_TIME=0
INDIVIDUAL_TEST_TIME=0
COLORIZE=0
+# The directory in which is suite.sh (this script)
+SUITE_DIR=$( dirname $0 )
# The directory in which to start:
-TOPDIR=`readlink -f $PWD/../../../..`
-CRTDIR=`pwd`
+TOPDIR=$( readlink -f $SUITE_DIR/../../../.. )
+CRTDIR=$( /bin/pwd )
# Disable usage stats in test suite
export SWIFT_USAGE_STATS=0
@@ -357,7 +359,7 @@
LABEL="$2" # Text on link to output
CMD=$3 # Command issued (td title)
RESULT=$4 # Passed or Failed
-
+
if [ $TEXTREPORT == 1 ]; then
if [ "$TYPE" == "test" ]; then
if [ "$RESULT" == "Passed" ]; then
@@ -697,7 +699,7 @@
process_exec $SCRIPT
RESULT=$( result )
-
+
output_report test "$SYMBOL" "$LASTCMD" $RESULT
check_bailout
@@ -707,7 +709,7 @@
GROUP=$1
NAME=$2
RESULT="None"
-
+
if [ -f "$GROUP/$NAME.in" ]; then
echo "Copying input: $NAME.in"
cp -v $GROUP/$NAME.in . 2>&1 >> $OUTPUT
@@ -818,7 +820,7 @@
TEST_SHOULD_FAIL=0
OUTPUT=$NAME.check.stdout
if [ -x $GROUP/$CHECKSCRIPT ]; then
- cp "$GROUP/$CHECKSCRIPT" .
+ cp "$GROUP/$CHECKSCRIPT" .
export TEST_LOG=$NAME.stdout
script_exec ./$CHECKSCRIPT "√"
else
@@ -848,7 +850,7 @@
TIMEOUTFILE=$NAME.timeout
TEST_SHOULD_FAIL=0
-
+
OUTPUT=$NAME.setup.stdout
if [ -x $GROUP/$SETUPSCRIPT ]; then
script_exec $GROUP/$SETUPSCRIPT "S"
@@ -960,9 +962,9 @@
elif [ -f "$GROUP/gensites.template" ]; then
TEMPLATE=`$GROUP/gensites.template`
else
- TEMPLATE="$TESTDIR/sites/localhost.xml"
+ TEMPLATE="$TESTDIR/sites/local/sites.template.xml"
fi
-
+
# Give default to _WORK_ if undefined in swift.properties
if [ -z "$WORK" ]
then
@@ -1072,7 +1074,7 @@
checkfail "Could not list: $GROUP"
for TEST in $SWIFTS; do
-
+
(( SKIP_COUNTER++ < SKIP_TESTS )) && continue
@@ -1089,7 +1091,7 @@
ITERS_LOCAL=`cat $GROUP/$SCRIPT_BASENAME.repeat`
else
ITERS_LOCAL=1
- fi
+ fi
for (( i=0; $i<$ITERS_LOCAL; i=$i+1 )); do
@@ -1100,7 +1102,7 @@
mkdir -p $TESTNAMEDIR
pushd $TESTNAMEDIR > /dev/null 2>&1
- cp $TEST .
+ cp $TEST .
group_swift_properties
group_sites_xml
group_tc_data
More information about the Swift-commit
mailing list