opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make the production buildbot use Main's tool conf

Browse Source
This commit is contained in:
Nate Coraor
2010-10-26 16:03:36 -04:00
parent 0e4b2be318
commit 4835512eda
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/functional_tests.py
+3 -1
View File
@@ -54,6 +54,7 @@ def main():
galaxy_test_file_dir = os.path.join( os.getcwd(), galaxy_test_file_dir )
start_server = 'GALAXY_TEST_EXTERNAL' not in os.environ
tool_path = os.environ.get( 'GALAXY_TEST_TOOL_PATH', 'tools' )
tool_config_file = os.environ.get( 'GALAXY_TEST_TOOL_CONF', 'tool_conf.xml.sample' )
if start_server:
psu_production = False
galaxy_test_proxy_port = None
@@ -75,6 +76,7 @@ def main():
nginx_upload_store = os.environ.get( 'GALAXY_TEST_NGINX_UPLOAD_STORE', None )
if not nginx_upload_store:
raise Exception( 'Please set GALAXY_TEST_NGINX_UPLOAD_STORE to the path where the nginx upload module places uploaded files' )
tool_config_file = 'tool_conf.xml.main'
default_cluster_job_runner = os.environ.get( 'GALAXY_TEST_DEFAULT_CLUSTER_JOB_RUNNER', 'pbs:///' )
file_path = tempfile.mkdtemp( dir=base_file_path )
new_file_path = tempfile.mkdtemp( dir=base_new_file_path )
@@ -142,7 +144,7 @@ def main():
file_path = file_path,
new_file_path = new_file_path,
tool_path = tool_path,
tool_config_file = "tool_conf.xml.sample",
tool_config_file = tool_config_file,
datatype_converters_config_file = "datatype_converters_conf.xml.sample",
tool_parse_help = False,
test_conf = "test.conf",