Merge branch 'master' into fix_cluster_constraints_init

Author: vaughnbetz

ODIN_II/regression_test/benchmark/suite/light_suite/task_list.conf

@@ -9,3 +9,4 @@ regression_test/benchmark/task/syntax
 regression_test/benchmark/task/FIR
 regression_test/benchmark/task/micro
 regression_test/benchmark/suite/complex_synthesis_suite
+regression_test/benchmark/suite/vtr_multiclock_suite

ODIN_II/regression_test/benchmark/suite/vtr_multiclock_suite/task_list.conf

@@ -0,0 +1 @@
+vtr::vtr_reg_multiclock

ODIN_II/verify_odin.sh

@@ -1255,7 +1255,7 @@ FILTERED_VTR_TASK_PATH="${NEW_RUN_DIR}/vtr/task_list.txt"
 function run_vtr_reg() {
 	pushd "${VTR_DIR}"  &> /dev/null
 	RELATIVE_PATH_TO_TEST=$(realapath_from "${FILTERED_VTR_TASK_PATH}" "${VTR_REG_DIR}")
-	/usr/bin/env perl run_reg_test.py -j "${_NUMBER_OF_PROCESS}" "${RELATIVE_PATH_TO_TEST}"
+	/usr/bin/env perl run_reg_test.py -j "${_NUMBER_OF_PROCESS}" $(dirname ${RELATIVE_PATH_TO_TEST})
 	popd  &> /dev/null
 }
 
@@ -1277,7 +1277,7 @@ function filter_vtr_test() {
 		pushd "${VTR_REG_DIR}"  &> /dev/null
 		for test in $(cat "${VTR_TASK_PATH}")
 		do 
-			if grep -E "circuit_list_add=.*\.v" "${test/regression_tests\//}/config/config.txt" &> "/dev/null"
+			if grep -E "circuit_list_add=.*\.v" "${VTR_REG_DIR/regression_tests}${test}/config/config.txt" &> "/dev/null"
 			then 
 				echo $test >> "${FILTERED_VTR_TASK_PATH}"; 
 			fi