[Swift-commit] r6665 - in branches/release-0.94/tests: . sites
davidk at ci.uchicago.edu
davidk at ci.uchicago.edu
Thu Jul 25 14:27:47 CDT 2013
Author: davidk
Date: 2013-07-25 14:27:47 -0500 (Thu, 25 Jul 2013)
New Revision: 6665
Removed:
branches/release-0.94/tests/addtests.html
branches/release-0.94/tests/array_index.swift
branches/release-0.94/tests/meta.sh
branches/release-0.94/tests/providers
branches/release-0.94/tests/sites/beagle/
branches/release-0.94/tests/sites/crow/
branches/release-0.94/tests/sites/fusion/
branches/release-0.94/tests/sites/ibicluster/
branches/release-0.94/tests/sites/intrepid/
branches/release-0.94/tests/sites/local-coasters/
branches/release-0.94/tests/sites/local/
branches/release-0.94/tests/sites/mcs/
branches/release-0.94/tests/sites/osg/
branches/release-0.94/tests/sites/surveyor/
branches/release-0.94/tests/sites/uc3/
branches/release-0.94/tests/sitetester
Modified:
branches/release-0.94/tests/USAGENOTES.txt
Log:
Removing the old site tests to make room for the new automated site tester
Modified: branches/release-0.94/tests/USAGENOTES.txt
===================================================================
--- branches/release-0.94/tests/USAGENOTES.txt 2013-07-25 18:45:06 UTC (rev 6664)
+++ branches/release-0.94/tests/USAGENOTES.txt 2013-07-25 19:27:47 UTC (rev 6665)
@@ -252,12 +252,3 @@
- *run-suite.sh*:
a. Wrapper for *suite.sh*.
b. Env variables set may be customized by user.
-
-- *meta.sh*:
- a. Wrapper for *run-suite.sh*.
- b. used to execute _run-suite/suite.sh_ from a remote site using *ssh*.
-
-.Example usage:
-*********************************************************************************************
- meta.sh login.pads.ci.uchicago.edu /home/skenny/swift_runs/tests sites/pads-pbs-coasters.sh
-*********************************************************************************************
Deleted: branches/release-0.94/tests/addtests.html
===================================================================
--- branches/release-0.94/tests/addtests.html 2013-07-25 18:45:06 UTC (rev 6664)
+++ branches/release-0.94/tests/addtests.html 2013-07-25 19:27:47 UTC (rev 6665)
@@ -1,10 +0,0 @@
-<html>
- <head>
- <title>How to add new tests</title>
- </head>
- <body>
- <p>The tests are automatically run from the tests directory in vdsk.
-Any file with a .dtm extension in there will be considered a test and executed
-on the next run.</p>
- </body>
-</html>
Deleted: branches/release-0.94/tests/array_index.swift
===================================================================
--- branches/release-0.94/tests/array_index.swift 2013-07-25 18:45:06 UTC (rev 6664)
+++ branches/release-0.94/tests/array_index.swift 2013-07-25 19:27:47 UTC (rev 6665)
@@ -1,12 +0,0 @@
-type file {}
-
-
-(file t) echo_array (string s[]) {
- app {
- echo s[0] s[1] s[2] stdout=@filename(t);
- }
-}
-
-string greetings[] = ["how","are","you"];
-file hw = echo(greetings);
-
Deleted: branches/release-0.94/tests/meta.sh
===================================================================
--- branches/release-0.94/tests/meta.sh 2013-07-25 18:45:06 UTC (rev 6664)
+++ branches/release-0.94/tests/meta.sh 2013-07-25 19:27:47 UTC (rev 6665)
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# runs run-suite.sh (wrapper for suite.sh) on a given site based on login
-
-SITE_LOGIN=$1 # e.g. login.pads.ci.uchicago.edu
-
-DIR=$2 # e.g., /home/skenny/swift_runs/tests
-
-TEST=$3 # e.g. sites/pads-pbs-coasters.sh
-
-# run test and retrieve results
-
-RUNDIR=run-$( date +"%Y-%m-%d" )
-
-ssh $SITE_LOGIN $DIR/run-suite.sh $DIR/$TEST
-scp -r $SITE_LOGIN:$RUNDIR .
-
-exit 0
Deleted: branches/release-0.94/tests/providers
===================================================================
--- branches/release-0.94/tests/providers 2013-07-25 18:45:06 UTC (rev 6664)
+++ branches/release-0.94/tests/providers 2013-07-25 19:27:47 UTC (rev 6665)
@@ -1 +0,0 @@
-link sites
\ No newline at end of file
Deleted: branches/release-0.94/tests/sitetester
===================================================================
--- branches/release-0.94/tests/sitetester 2013-07-25 18:45:06 UTC (rev 6664)
+++ branches/release-0.94/tests/sitetester 2013-07-25 19:27:47 UTC (rev 6665)
@@ -1,59 +0,0 @@
-#!/usr/bin/env python
-
-import commands
-import os
-
-# the workdir for a given site needs to exist on the site you're testing
-# and should contain run-suite & suite.sh
-# this script will ssh onto the site, pass run-suite the necesary variables
-# for running suite.sh
-
-class Site:
-
- def __init__(self,login,logtype,workdir,queue,project):
- self.login = login
- self.logintype = logtype
- self.workdir = workdir
- self.queue = queue
- self.project = project
-
- def testSite(self,cogv,swiftv,test_type):
- cmdline = self.logintype+" "+self.login+" "+self.workdir+"/run-suite.sh "+self.workdir+"/"+test_type+" "+self.workdir+" "+self.queue+" "+self.project+" "+cogv+" "+swiftv
- print "running......"+cmdline
- res = commands.getoutput(cmdline)
- print res
- cmdline2 = "scp -r "+s+":"+rundir+" ."
- res2 = commands.getoutput(cmdline)
-
-
-
-
-#---------------------main--------------------------------------------------------
-
-sites = []
-
-s_logins = ['skenny at login2.pads.ci.uchicago.edu','login-abe.ncsa.teragrid.org','login1-qb.loni-lsu.teragrid.org']
-logintype = ['ssh','gsissh','gsissh']
-workdirs = ['/home/skenny/swift_runs/tests','/u/ac/skenny/swift_runs/tests','/home/skenny/swift_runs/tests']
-queues = ['short','debug','workq']
-projects = ['CI-IBN000039','TG-DBS080004N','TG-DBS080004N']
-
-test_type = "groups/local-pbs-coasters.sh"
-cogv = 'branches/4.1.8'
-swiftv = 'branches/release-0.92'
-
-rundir = commands.getoutput('date +\"%Y-%m-%d\"')
-rundir = "run-"+rundir
-
-for idx,s in enumerate(s_logins):
- sites.append(Site(s,logintype[idx],workdirs[idx],queues[idx],projects[idx]))
-
-# loop over all or run single
-
-sites[1].testSite(cogv,swiftv,test_type)
-sites[2].testSite(cogv,swiftv,test_type)
-
-
-
-
-
More information about the Swift-commit
mailing list