Fix test cases from merge

RWTH-HPC · Apr 24, 2019 · 483c414 · 483c414
1 parent bcb9973
commit 483c414
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/clang/tools/sotoc/test/arrays/static_variable_length_array_2d.c b/clang/tools/sotoc/test/arrays/static_variable_length_array_2d.c
@@ -17,11 +17,7 @@ int main(){
   }
 
   for (j = 0; j < size; j+=64) {
-<<<<<<< HEAD
     printf("%.2f %.2f ",A[j][0],A[j][1]);
-=======
-    printf("%.2f %.2f",A[j][0],A[j][1]);
->>>>>>> aurora_offloading_prototype
   }
   return 0;
 }

diff --git a/clang/tools/sotoc/test/declare_target/declare_static_variable.c b/clang/tools/sotoc/test/declare_target/declare_static_variable.c
@@ -13,6 +13,7 @@ int main(){
   #pragma omp target
   {
     printf("%d\n", a);
+    fflush(0);
   }
 }