Skip to content

Commit 483c414

Browse files
committed
Fix test cases from merge
1 parent bcb9973 commit 483c414

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

clang/tools/sotoc/test/arrays/static_variable_length_array_2d.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@ int main(){
1717
}
1818

1919
for (j = 0; j < size; j+=64) {
20-
<<<<<<< HEAD
2120
printf("%.2f %.2f ",A[j][0],A[j][1]);
22-
=======
23-
printf("%.2f %.2f",A[j][0],A[j][1]);
24-
>>>>>>> aurora_offloading_prototype
2521
}
2622
return 0;
2723
}

clang/tools/sotoc/test/declare_target/declare_static_variable.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ int main(){
1313
#pragma omp target
1414
{
1515
printf("%d\n", a);
16+
fflush(0);
1617
}
1718
}
1819

0 commit comments

Comments
 (0)