ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/test/SConscript
(Generate patch)

Comparing ray/test/SConscript (file contents):
Revision 1.2 by schorsch, Thu Mar 10 01:49:56 2016 UTC vs.
Revision 1.3 by schorsch, Mon Mar 28 17:48:43 2016 UTC

# Line 1 | Line 1
1   # -*- coding: latin-1 -*-
2 + from __future__ import division, print_function, unicode_literals
3 +
4   import os
5   import sys
4 import run_all
6  
7 + import run_tests
8 +
9   Import('env')
10  
11   def run_tests(target=None,source=None,env=None):
12 <        try:
13 <                oldenv = env['ENV']
14 <                ray = os.getcwd()
12 <                bin = Dir(env['RAD_BUILDBIN']).get_abspath()
13 <                lib = Dir(env['RAD_BUILDLIB']).get_abspath()
12 >        bindir = Dir(env['RAD_BUILDBIN']).get_abspath()
13 >        radlib = Dir(env['RAD_BUILDRLIB']).get_abspath()
14 >        run_tests.RadianceTests(bindir=[bindir], radlib=[radlib], V=True)
15  
16 <                test = os.path.join(ray, 'test')
16 <                if not test in sys.path:
17 <                        sys.path.append(test)
18 <                oldpath = oldenv.get('PATH')
19 <                #print oldpath
20 <                newpath = os.pathsep.join((bin, oldpath))
21 <                newenv = {'PATH' : newpath, 'RAYPATH':lib }
22 <                env['ENV'] = newenv
23 <                run_all.main(bindir=bin)
24 <        finally:
25 <                env['ENV'] = oldenv
26 <
27 <
28 < env.Command(None,'run_all.py',action=Action(run_tests))
16 > env.Command(None,'run_tests.py',action=Action(run_tests))

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines