blob: b2c8de76102f030c76bdb571aaece7fc22906a02 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
--- gpu/config/gpu_test_config.cc.orig 2017-04-19 19:06:34 UTC
+++ gpu/config/gpu_test_config.cc
@@ -24,7 +24,7 @@ namespace {
GPUTestConfig::OS GetCurrentOS() {
#if defined(OS_CHROMEOS)
return GPUTestConfig::kOsChromeOS;
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+#elif defined(OS_LINUX) || defined(OS_BSD)
return GPUTestConfig::kOsLinux;
#elif defined(OS_WIN)
int32_t major_version = 0;
@@ -255,6 +255,10 @@ bool GPUTestBotConfig::LoadCurrentConfig
bool rt;
if (gpu_info == NULL) {
GPUInfo my_gpu_info;
+#if defined(OS_FREEBSD)
+ rt = false;
+ LOG(WARNING) << "CollectGpuID not present on FreeBSD";
+#else
CollectInfoResult result = CollectGpuID(
&my_gpu_info.gpu.vendor_id, &my_gpu_info.gpu.device_id);
if (result != kCollectInfoSuccess) {
@@ -264,6 +268,7 @@ bool GPUTestBotConfig::LoadCurrentConfig
} else {
rt = SetGPUInfo(my_gpu_info);
}
+#endif
} else {
rt = SetGPUInfo(*gpu_info);
}
|
