(#6477) Tracking commit. Temporarily disable condor_gpu_monitor build…

… in the BaTLab. Fix the CI test.
htcondor · Jan 23, 2018 · ab2aeba · ab2aeba
1 parent c255e3d
commit ab2aeba
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/nmi_tools/glue/test/remote_task.pl b/nmi_tools/glue/test/remote_task.pl
@@ -338,7 +338,8 @@ sub ProcessTestRequirements
             }
 
             if($record && $line =~ /CONDOR_TESTREQ_CONFIG/) {
-                $requirements->{testconf} = $conf . "\n";
+                $requirements->{testconf} = "TEST_DIR = ${test_dir}\n";
+                $requirements->{testconf} .= $conf . "\n";
                 $record = 0;
             }
 

diff --git a/src/condor_tests/CMakeLists.txt b/src/condor_tests/CMakeLists.txt
@@ -498,6 +498,7 @@ if (BUILD_TESTING)
 
 	if(LINUX)
 		condor_pl_test(job_cpu_affinity_check "ensure Matlog has only matches" "core;quick;full")
+		condor_pl_test(cmr-monitor-basic "custom machine resource monitors" "core;quick;full")
 	endif ( LINUX )
 
 	condor_pl_test(job_concurrency_limitsS "Check concurrency" "core;quick;full")

diff --git a/src/condor_tools/CMakeLists.txt b/src/condor_tools/CMakeLists.txt
@@ -131,11 +131,11 @@ endif()
 ############################################################
 if ( LINUX AND HAVE_LIBDL AND HAVE_DLFCN_H AND HAVE_DLOPEN )
 	condor_exe( condor_gpu_discovery "condor_gpu_discovery.cpp" ${C_LIBEXEC} "${HAVE_LIBDL}" OFF )
-	add_executable( condor_gpu_utilization "condor_gpu_utilization.c" )
-	target_link_libraries( condor_gpu_utilization "-L/usr/lib64/nvidia;-lnvidia-ml" )
-	target_include_directories( condor_gpu_utilization PRIVATE "/usr/local/cuda/include" )
-	target_compile_options( condor_gpu_utilization PRIVATE "-std=c99;-g;-Wall" )
-	install( TARGETS condor_gpu_utilization DESTINATION ${C_LIBEXEC} )
+#	add_executable( condor_gpu_utilization "condor_gpu_utilization.c" )
+#	target_link_libraries( condor_gpu_utilization "-L/usr/lib64/nvidia;-lnvidia-ml" )
+#	target_include_directories( condor_gpu_utilization PRIVATE "/usr/local/cuda/include" )
+#	target_compile_options( condor_gpu_utilization PRIVATE "-std=c99;-g;-Wall" )
+#	install( TARGETS condor_gpu_utilization DESTINATION ${C_LIBEXEC} )
 else ()
 	if (WINDOWS)
 		condor_exe( condor_gpu_discovery "condor_gpu_discovery.cpp" ${C_LIBEXEC} "${CONDOR_TOOL_LIBS}" OFF )