Run Sheldon tests only for OTP 23+

erlang-ls · Dec 1, 2021 · 5fe3acd · 5fe3acd
1 parent 2230790
commit 5fe3acd
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 27 deletions.
diff --git a/apps/els_lsp/priv/code_navigation/src/diagnostics_sheldon.erl b/apps/els_lsp/priv/code_navigation/src/diagnostics_sheldon.erl
@@ -1,5 +1,4 @@
--module(diagnostics_sheldon).
-
 %% Trigger some "somestrange" warnings
 
 %% Trigger some "sheldon" warnings
+-module(diagnostics_sheldon).
diff --git a/apps/els_lsp/test/els_diagnostics_SUITE.erl b/apps/els_lsp/test/els_diagnostics_SUITE.erl
@@ -61,7 +61,7 @@
 %%==============================================================================
 -spec suite() -> [tuple()].
 suite() ->
-  [{timetrap, {seconds, 300}}].
+  [{timetrap, {seconds, 30}}].
 
 -spec all() -> [atom()].
 all() ->
@@ -667,30 +667,36 @@ gradualizer(_Config) ->
 
 -spec sheldon(config()) -> ok.
 sheldon(_Config) ->
-  {ok, Cwd} = file:get_cwd(),
-  RootPath = els_test_utils:root_path(),
-  try
-      file:set_cwd(RootPath),
-      Path = src_path("diagnostics_sheldon.erl"),
-      Source = <<"Sheldon">>,
-      Errors = [],
-      Warnings = [ #{ code => spellcheck
-                    , message => <<"The word \"sheldon\" in comment is unknown"
-                                   ". Maybe you wanted to use \"Sheldon\"?">>
-                    , range => {{4, 0}, {5, 0}}
-                    , relatedInformation => []
-                    }
-                 , #{ code => spellcheck
-                    , message => <<"The word \"somestrange\" in comment is "
-                                    "unknown.">>
-                    , range => {{2, 0}, {3, 0}}
-                    , relatedInformation => []
-                    }
-                 ],
-      Hints = [],
-      els_test:run_diagnostics_test(Path, Source, Errors, Warnings, Hints)
-  catch _Err ->
-      file:set_cwd(Cwd)
+  case list_to_integer(erlang:system_info(otp_release)) >= 23 of
+    true ->
+      {ok, Cwd} = file:get_cwd(),
+      RootPath = els_test_utils:root_path(),
+      try
+          file:set_cwd(RootPath),
+          Path = src_path("diagnostics_sheldon.erl"),
+          Source = <<"Sheldon">>,
+          Errors = [],
+          Warnings = [ #{ code => spellcheck
+                        , message => <<"The word \"sheldon\" in "
+                                       "comment is unknown. "
+                                       "Maybe you wanted to use \"Sheldon\"?">>
+                        , range => {{2, 0}, {3, 0}}
+                        , relatedInformation => []
+                        }
+                     , #{ code => spellcheck
+                        , message => <<"The word \"somestrange\" in comment is "
+                                        "unknown.">>
+                        , range => {{0, 0}, {1, 0}}
+                        , relatedInformation => []
+                        }
+                     ],
+          Hints = [],
+          els_test:run_diagnostics_test(Path, Source, Errors, Warnings, Hints)
+      catch _Err ->
+          file:set_cwd(Cwd)
+      end;
+    false ->
+      ok
   end,
   ok.