Skip to content

Commit a2ce6ac

Browse files
committed
Added testing to the modules to be built
1 parent 9990b92 commit a2ce6ac

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

Packages/testing/regression.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ def init():
2727
return vcsinst
2828

2929
def run(vcsinst, fname, baseline=sys.argv[1], threshold=defaultThreshold):
30+
"""Export plot to a png and exit after comparsion."""
3031
vcsinst.png(fname)
3132
sys.exit(check_result_image(fname, baseline, threshold))
3233

3334
def run_wo_terminate(vcsinst, fname, baseline=sys.argv[1], threshold=defaultThreshold):
35+
"""Export plot to a png and return comparison with baseline."""
3436
vcsinst.png(fname)
3537
return check_result_image(fname, baseline, threshold)
3638

Packages/testing/setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@
99
description="Testing infrastructure for cdat",
1010
url="http://uvcdat.llnl.gov",
1111
packages=['testing'],
12-
package_dir={'testing': 'testing',},
13-
install_requires=['numpy','vcs', 'vtk'],
12+
package_dir = {'testing': '', }
1413
)

installation/control.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file is used to control the behavior of install.py.
22

33
# The search path is used if the X11 directories aren't configured.
4-
x11search = ['/usr/X11R6', '/usr/X11R6.5.1',
4+
x11search = ['/usr/X11R6', '/usr/X11R6.5.1',
55
'/usr/X11R6.4','/usr','/usr/openwin','/opt']
66
# Here is where they are on OSF1 and perhaps similar systems
77
x11OSF1lib = ['/usr/lib/X11', '/usr/lib']
@@ -48,24 +48,25 @@
4848
make_code = 'make'
4949

5050
# List of packages to be built
51-
packages = [
51+
packages = [
5252
"Packages/pydebug",
5353
"Packages/cdtime",
5454
"Packages/demo",
5555
"Packages/help",
5656
"Packages/regrid2",
57-
"Packages/cdms2",
58-
"Packages/esg",
57+
"Packages/cdms2",
58+
"Packages/esg",
5959
"Packages/ncml",
6060
"Packages/DV3D",
6161
"Packages/vcs",
6262
"Packages/vcsaddons",
6363
"Packages/cdutil",
6464
"Packages/unidata",
6565
"Packages/xmgrace",
66-
"Packages/genutil",
66+
"Packages/genutil",
6767
"Packages/Thermo",
6868
"Packages/WK",
6969
"Packages/gui_support",
7070
"Packages/distarray",
71+
"Packages/testing",
7172
]

0 commit comments

Comments
 (0)