Merge pull request #76 from qhool/maybe_optional

Un-break katana for projects that do not enable maybe_expr

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     strategy:
       matrix:
@@ -34,6 +34,8 @@ jobs:
       run: ERL_FLAGS="-enable-feature all" rebar3 compile
     - name: Format check
       run: ERL_FLAGS="-enable-feature all" rebar3 format --verify
-    - name: Run tests and verifications
+    - name: Run tests and verifications (features not enabled)
+      run: rebar3 test
+    - name: Run tests and verifications (features enabled)
       run: ERL_FLAGS="-enable-feature all" rebar3 test
 

rebar.config

@@ -1,13 +1,7 @@
 %% -*- mode: erlang;erlang-indent-level: 2;indent-tabs-mode: nil -*-
 %% ex: ts=4 sw=4 ft=erlang et
 {erl_opts,
- [warn_unused_import,
-  warn_export_vars,
-  warnings_as_errors,
-  verbose,
-  report,
-  debug_info,
-  {feature, maybe_expr, enable}]}.
+ [warn_unused_import, warn_export_vars, warnings_as_errors, verbose, report, debug_info]}.
 
 {minimum_otp_vsn, "23"}.
 

test/ktn_code_SUITE.erl

@@ -23,7 +23,16 @@
 -spec all() -> [atom()].
 all() ->
     Exports = ?MODULE:module_info(exports),
-    [F || {F, _} <- Exports, not lists:member(F, ?EXCLUDED_FUNS)].
+    %% Do not test maybe expressions if the feature is not enabled in the emulator
+    DisabledMaybeTests =
+        case lists:member(maybe_expr, enabled_features()) of
+            true ->
+                [];
+            false ->
+                [parse_maybe, parse_maybe_else]
+        end,
+    Excluded = ?EXCLUDED_FUNS ++ DisabledMaybeTests,
+    [F || {F, _} <- Exports, not lists:member(F, Excluded)].
 
 -spec init_per_suite(config()) -> config().
 init_per_suite(Config) ->
@@ -33,6 +42,14 @@ init_per_suite(Config) ->
 end_per_suite(Config) ->
     Config.
 
+enabled_features() ->
+    try
+        erl_features:enabled()
+    catch
+        error:undef ->
+            []
+    end.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Test Cases
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%