From e5eb40e61d236b82a9f3d7d08bce24927c849375 Mon Sep 17 00:00:00 2001
From: Maxime Perrotin <maxime.perrotin@esa.int>
Date: Tue, 27 Aug 2019 18:34:10 +0200
Subject: [PATCH] Fix bugs for test22

---
 .../concurrency_view/pohic_wrappers_body/ri.tmplt      | 10 +++++++---
 test/test22/Makefile                                   |  8 ++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/templates/concurrency_view/pohic_wrappers_body/ri.tmplt b/templates/concurrency_view/pohic_wrappers_body/ri.tmplt
index 572d3a9..e2d171e 100644
--- a/templates/concurrency_view/pohic_wrappers_body/ri.tmplt
+++ b/templates/concurrency_view/pohic_wrappers_body/ri.tmplt
@@ -12,6 +12,9 @@
 @@-- @_Remote_Interface_Names_@ :   |_ callee's interface name
 @@-- @_Calling_Threads_@        : Calling threads of the containing block
 // Required interface @_Name_@ in function @_Parent_Function_@
+@@IF@@ @_Param_Names'Length_@ = 0
+   @@SET@@ No_Param=True
+@@END_IF@@
 @@IF@@ @_Param_Names'Length_@ = 0
 void vm_@_LOWER:Parent_Function_@_@_LOWER:Name_@(void)
 @@ELSE@@
@@ -56,9 +59,6 @@ size_IN_buf_@_LOWER:Param_Names_@;
 @@END_TABLE@@
    // calling threads: @_Calling_Threads_@ partition: @_Partition_Name_@
 @@ELSIF@@ @_Kind_@ = UNPROTECTED_OPERATION
-@@IF@@ @_Param_Names'Length_@ = 0
-   @@SET@@ No_Param=True
-@@END_IF@@
    // Unprotected call
 @@TABLE@@
 @@IF@@ @_No_Param_@
@@ -79,6 +79,9 @@ size_IN_buf_@_LOWER:Param_Names_@;
 @@ELSE@@ @@-- Protected call
    // puts("[TASTE] Protected call of @_Name_@");
 @@TABLE@@
+@@IF@@ @_No_Param_@
+   pro_@_LOWER:Remote_Function_Names_@_@_Remote_Interface_Names_@();
+@@ELSE@@
    pro_@_LOWER:Remote_Function_Names_@_@_Remote_Interface_Names_@
 @@INLINE(        \()(,\n         )(\);\n)@@
    @@TABLE@@
@@ -89,6 +92,7 @@ size_IN_buf_@_LOWER:Param_Names_@;
       @@END_IF@@
    @@END_TABLE@@
 @@END_INLINE@@
+@@END_IF@@
 @@END_TABLE@@
 @@END_IF@@
 }
diff --git a/test/test22/Makefile b/test/test22/Makefile
index 16aff88..2ecb968 100644
--- a/test/test22/Makefile
+++ b/test/test22/Makefile
@@ -1,15 +1,15 @@
 KAZOO=../../kazoo
 
 all: test-parse
-	cd output && make
+	$(MAKE) -C output.pohic
 
 test-parse: clean
-	$(KAZOO) --gw \
-	               -o output \
+	$(KAZOO) --gw -p \
+	               -o output.pohic \
 	               --glue \
 		       --debug
 
 clean:
-	rm -rf output
+	rm -rf output.pohic
 
 .PHONY: clean test-parse
-- 
GitLab