allow building disabled tests on Windows and Apple

Summary:
For other kind of disabled tests they can be reenabled by setting
`BUILD_<LABEL>`.

For `WINDOWS_DISABLED` and `APPLE_DISABLED` the log message incorrectly advises
to pass `WINDOWS_DISABLED` and `APPLE_DISABLED` to enable it, which would do
nothing. Change this to `BUILD_WINDOWS_DISABLED` and `BUILD_APPLE_DISABLED` and
actually check if they are set.

Reviewed By: yfeldblum

Differential Revision: D60181795

fbshipit-source-id: c48acce725cbfb3275e1ba46f1aa91c13d4c58be

CMake/FollyFunctions.cmake

@@ -279,10 +279,10 @@ function(folly_define_tests)
  message("Skipping slow test ${cur_dir_name}${cur_test_name}, enable with BUILD_SLOW_TESTS")
  elseif ("HANGING" IN_LIST test_${cur_test}_tag AND NOT BUILD_HANGING_TESTS)
  message("Skipping hanging test ${cur_dir_name}${cur_test_name}, enable with BUILD_HANGING_TESTS")
- elseif ("WINDOWS_DISABLED" IN_LIST test_${cur_test}_tag AND WIN32)
- message("Skipping windows disabled test ${cur_dir_name}${cur_test_name}, enable with WINDOWS_DISABLED")
- elseif ("APPLE_DISABLED" IN_LIST test_${cur_test}_tag AND APPLE)
- message("Skipping apple disabled test ${cur_dir_name}${cur_test_name}, enable with APPLE_DISABLED")
+ elseif ("WINDOWS_DISABLED" IN_LIST test_${cur_test}_tag AND WIN32 AND NOT BUILD_WINDOWS_DISABLED)
+ message("Skipping windows disabled test ${cur_dir_name}${cur_test_name}, enable with BUILD_WINDOWS_DISABLED")
+ elseif ("APPLE_DISABLED" IN_LIST test_${cur_test}_tag AND APPLE AND NOT BUILD_APPLE_DISABLED)
+ message("Skipping apple disabled test ${cur_dir_name}${cur_test_name}, enable with BUILD_APPLE_DISABLED")
  elseif (${test_${cur_test}_is_benchmark} AND NOT BUILD_BENCHMARKS)
  message("Skipping benchmark ${cur_dir_name}${cur_test_name}, enable with BUILD_BENCHMARKS")
  else()