From ab2aebaa6d8e92c4926c636271c442bb42c017a0 Mon Sep 17 00:00:00 2001 From: Todd L Miller Date: Tue, 23 Jan 2018 11:06:51 -0600 Subject: [PATCH] (#6477) Tracking commit. Temporarily disable condor_gpu_monitor build in the BaTLab. Fix the CI test. --- nmi_tools/glue/test/remote_task.pl | 3 ++- src/condor_tests/CMakeLists.txt | 1 + src/condor_tools/CMakeLists.txt | 10 +++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/nmi_tools/glue/test/remote_task.pl b/nmi_tools/glue/test/remote_task.pl index 355f54f92c3..639fdd2f6b2 100755 --- 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 index eec5e3dd3f9..8219685c42b 100644 --- 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 index 2b93bba84d9..a02605770e7 100644 --- 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 )