Merge pull request #2057 from DARMA-tasking/2056-fix-fcontext-compila…

…tion 2056: fix compilation with `fcontext` enabled
DARMA-tasking · Jan 10, 2023 · d0b2408 · d0b2408
2 parents 8925637 + beb7755
commit d0b2408
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml
@@ -45,7 +45,7 @@ variables:
   VT_TESTS_NUM_NODES: 2
   VT_UNITY_BUILD: 1
   VT_PRODUCTION_BUILD: 0
-  VT_FCONTEXT: 0
+  VT_FCONTEXT: 1
   VT_USE_OPENMP: 0
   VT_USE_STD_THREAD: 0
   VT_ZOLTAN: 0

diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini
@@ -190,6 +190,7 @@ compiler_type = clang
 compiler = clang-11
 distro = 22.04
 output_name = ci/azure/azure-clang-11-ubuntu-mpich.yml
+vt_fcontext = 1
 
 [PR-tests-clang-12]
 test_configuration = "clang-12, ubuntu, mpich"

diff --git a/tests/unit/active/test_async_op_threads.cc b/tests/unit/active/test_async_op_threads.cc
@@ -96,7 +96,7 @@ struct MyCol : vt::Collection<MyCol, vt::Index1D> {
         done_ = true;
         // stack should be the size before running this method since we haven't
         // resumed the thread yet!
-        EXPECT_EQ(theTerm()->getEpochStack().size(), size_stack_before_running_handler);
+        EXPECT_EQ(theTerm()->getEpochStack().size(), stack_size_before_running_handler);
       }
     );
 
@@ -198,7 +198,7 @@ struct MyCol : vt::Collection<MyCol, vt::Index1D> {
 TEST_F(TestAsyncOpThreads, test_async_op_threads_1) {
   auto const this_node = theContext()->getNode();
 
-  stack_size_before_running_handler = theTerm()->size_getEpochStack().size();
+  stack_size_before_running_handler = theTerm()->getEpochStack().size();
 
   vt::Index1D range(static_cast<int>(theContext()->getNumNodes()));
   auto p = vt::makeCollection<MyCol>("test_async_op_threads_invoke")