/[escript]/branches/domexper/scons/scons_extensions.py
ViewVC logotype

Diff of /branches/domexper/scons/scons_extensions.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2549 by jfenwick, Mon Jul 20 06:43:47 2009 UTC revision 2629 by trankine, Tue Aug 25 06:39:26 2009 UTC
# Line 37  def runUnitTest(target, source, env): Line 37  def runUnitTest(target, source, env):
37       app = "cd "+pn+"; "+os.path.join(env['bininstall'],"escript")+" -bv "+os.path.join('.',sn)       app = "cd "+pn+"; "+os.path.join(env['bininstall'],"escript")+" -bv "+os.path.join('.',sn)
38    else:    else:
39        if env['usempi']:        if env['usempi']:
40            app = "cd %s | mpiexec -np %s -genvlist PYTHONPATH,OMP_NUM_THREADS,"\            app = "cd %s & mpiexec -np %s -genvlist PYTHONPATH,OMP_NUM_THREADS,"\
41              "FINLEY_TEST_DATA,PYVISI_TEST_DATA_ROOT,PYVISI_WORKDIR,PATH %s"\              "FINLEY_TEST_DATA,PYVISI_TEST_DATA_ROOT,PYVISI_WORKDIR,PATH %s"\
42              %(pn,env['ENV']['ESCRIPT_NUM_NODES'], sn)              %(pn,env['ENV']['ESCRIPT_NUM_NODES'], sn)
43        else:        else:
44             app = "cd "+ pn +" | "+ sn             app = "cd "+ pn +" & "+sn
45    print "Executing test: " + app    print "Executing test: " + app
46    if not env.Execute(app):    if not env.Execute(app):
47      open(str(target[0]),'w').write("PASSED\n")      open(str(target[0]),'w').write("PASSED\n")
# Line 56  def runPyUnitTest(target, source, env): Line 56  def runPyUnitTest(target, source, env):
56     pn, sn= os.path.split(app)     pn, sn= os.path.split(app)
57     if os.name== "nt":     if os.name== "nt":
58         if env['usempi']:         if env['usempi']:
59             app = "cd %s | mpiexec -np %s -genvlist PYTHONPATH,OMP_NUM_THREADS,"\             app = "cd %s & mpiexec -np %s -genvlist PYTHONPATH,OMP_NUM_THREADS,"\
60                "FINLEY_TEST_DATA,PYVISI_TEST_DATA_ROOT,PYVISI_WORKDIR,PATH %s\pythonMPIredirect.exe %s"\                "FINLEY_TEST_DATA,PYVISI_TEST_DATA_ROOT,PYVISI_WORKDIR,PATH %s\pythonMPIredirect.exe %s"\
61                %(pn,env['ENV']['ESCRIPT_NUM_NODES'],env['libinstall'],sn)                %(pn,env['ENV']['ESCRIPT_NUM_NODES'],env['libinstall'],sn)
62         else:         else:
63             app = "cd "+ pn +" | "+sys.executable + " " + sn             app = "cd "+ pn +" & "+sys.executable + " " + sn
64     else:     else:
65       app = "cd "+pn+"; "+os.path.join(env['bininstall'],"escript")+" -ov "+sn       app = "cd "+pn+"; "+os.path.join(env['bininstall'],"escript")+" -ov "+sn
66     print "Executing test: ",app     print "Executing test: ",app

Legend:
Removed from v.2549  
changed lines
  Added in v.2629

  ViewVC Help
Powered by ViewVC 1.1.26