Fixes for test8

templates/concurrency_view/ada_pohi_gpr/partition.tmplt

@@ -57,12 +57,12 @@ project @_CAPITALIZE:Name_@ is
        "../../dataview/Ada",
 @@END_IF@@
 @@TABLE@@
-@@IF@@ @_Block_Languages_@ = sdl
-       "../../@_LOWER:Block_Names_@/@_UPPER:Block_Languages_@/code",
+@@IF@@ @_Block_Languages_@ = SDL
+       "../../@_LOWER:Block_Names_@/SDL/code",
 @@ELSE@@
-       "../../@_LOWER:Block_Names_@/@_UPPER:Block_Languages_@/src",
+       "../../@_LOWER:Block_Names_@/@_Block_Languages_@/src",
 @@END_IF@@
-       "../../@_LOWER:Block_Names_@/@_UPPER:Block_Languages_@/wrappers",
+       "../../@_LOWER:Block_Names_@/@_Block_Languages_@/wrappers",
 @@END_TABLE@@
        "../deploymentview_final/@_LOWER:Name_@")
         & external_as_list("ADA_INCLUDE_PATH", ":");

templates/concurrency_view/pohic_makefile_workaround/partition.tmplt

@@ -27,12 +27,12 @@ echo PO_HI_OBJS=\\ >@_LOWER:Name_@_build.sh
 @@INLINE( )( )()@@
 for d in @_LOWER:Name_@ ../../dataview/C
 @@TABLE@@
-@@IF@@ @_Block_Languages_@ = sdl
-       ../../@_LOWER:Block_Names_@/@_UPPER:Block_Languages_@/code
+@@IF@@ @_LOWER:Block_Languages_@ = sdl
+       ../../@_LOWER:Block_Names_@/SDL/code
 @@ELSE@@
-       ../../@_LOWER:Block_Names_@/@_UPPER:Block_Languages_@/src
+       ../../@_LOWER:Block_Names_@/@_Block_Languages_@/src
 @@END_IF@@
-       ../../@_LOWER:Block_Names_@/@_UPPER:Block_Languages_@/wrappers
+       ../../@_LOWER:Block_Names_@/@_Block_Languages_@/wrappers
 @@END_TABLE@@
 @@END_INLINE@@
 do

test/test8/Makefile

 KAZOO=../../kazoo
 
 all: test-parse
-	cd output && make
+	$(MAKE) -C output.pohic
 
 test-parse: clean
-	$(KAZOO) --gw \
-	               -o output \
-	               --glue \
-		       --debug
+	$(KAZOO) --gw -p -o output.pohic --glue --debug
 
 clean:
-	rm -rf output
+	rm -rf output.pohic
 
 .PHONY: clean test-parse