Back integrate internal test file changes from Perforce for consistency.

Author: brycelelbach

thrust_perf_tests.trs

@@ -18,15 +18,15 @@
   # The tests in the testsuite (required).
   "tests" : [
       {
-        "exe" : "{PYTHON} {TR_INSTALL_DIR}/opencl/_tests/GPUConfMgr/GPUConfMgr.py -caseName=set -clock=P0MAX -VULCAN_INSTALL={TR_INSTALL_DIR}",
+        "init" : "{PYTHON} {TR_INSTALL_DIR}/GPUConfMgr/GPUConfMgr.py -caseName=set -clock=P0 -VULCAN_INSTALL={TR_INSTALL_DIR}",
         "attributes" : [ ]
       },
       {
         "exe": "{PYTHON} {TR_TESTSUITE_DIR}/internal/scripts/eris_perf.py -b {TR_INSTALL_DIR}/bin/{TR_ARCH_PATH}/bench -p {TR_INSTALL_DIR}/thrust/internal/benchmark/combine_benchmark_results.py",
         "attributes": [ "result=multi" ]
       },
       {
-        "exe" : "{PYTHON} {TR_INSTALL_DIR}/opencl/_tests/GPUConfMgr/GPUConfMgr.py -caseName=reset -clock=P0MAX -VULCAN_INSTALL={TR_INSTALL_DIR}",
+        "fini" : "{PYTHON} {TR_INSTALL_DIR}/GPUConfMgr/GPUConfMgr.py -caseName=reset -clock=P0 -VULCAN_INSTALL={TR_INSTALL_DIR}",
         "attributes" : [ ]
       }
  ]

thrust_perf_tests.vlct

@@ -18,15 +18,15 @@
   # The tests in the testsuite (required).
   "tests" : [
       {
-        "exe" : "${PYTHON} ${VULCAN_INSTALL_DIR}/opencl/_tests/GPUConfMgr/GPUConfMgr.py -caseName=set -clock=P0MAX -VULCAN_INSTALL=${VULCAN_INSTALL_DIR}",
+        "exe" : "${PYTHON} ${VULCAN_INSTALL_DIR}/opencl/_tests/GPUConfMgr/GPUConfMgr.py -caseName=set -clock=P0 -VULCAN_INSTALL=${VULCAN_INSTALL_DIR}",
         "attributes" : [ ]
       },
       {
         "exe": "${PYTHON} eris_perf.py",
         "attributes": [ "result=multi" ]
       },
       {
-        "exe" : "${PYTHON} ${VULCAN_INSTALL_DIR}/opencl/_tests/GPUConfMgr/GPUConfMgr.py -caseName=reset -clock=P0MAX -VULCAN_INSTALL=${VULCAN_INSTALL_DIR}",
+        "exe" : "${PYTHON} ${VULCAN_INSTALL_DIR}/opencl/_tests/GPUConfMgr/GPUConfMgr.py -caseName=reset -clock=P0 -VULCAN_INSTALL=${VULCAN_INSTALL_DIR}",
         "attributes" : [ ]
       }
  ]

thrust_tests.trs

@@ -18,7 +18,7 @@
   # default timeout value of 900 seconds will be used.
   "timeout"     : "12000",
   # Default timeout for individual tests, in seconds (optional).
-  "testtimeout" : "900",
+  "testtimeout" : "2700",
   # The tests in the testsuite (required).
   "tests"       : [