Index: openmp/trunk/runtime/test/CMakeLists.txt
===================================================================
--- openmp/trunk/runtime/test/CMakeLists.txt
+++ openmp/trunk/runtime/test/CMakeLists.txt
@@ -31,6 +31,7 @@
 pythonize_bool(LIBOMP_HAVE_LIBATOMIC)
 
 add_openmp_testsuite(check-libomp "Running libomp tests" ${CMAKE_CURRENT_BINARY_DIR} DEPENDS omp)
+add_openmp_testsuite(check-ompt "Running OMPT tests" ${CMAKE_CURRENT_BINARY_DIR}/ompt DEPENDS omp)
 
 # Configure the lit.site.cfg.in file
 set(AUTO_GEN_COMMENT "## Autogenerated by libomp configuration.\n# Do not edit!")
Index: openmp/trunk/runtime/test/ompt/synchronization/lock.c
===================================================================
--- openmp/trunk/runtime/test/ompt/synchronization/lock.c
+++ openmp/trunk/runtime/test/ompt/synchronization/lock.c
@@ -10,7 +10,7 @@
     print_ids(0);
 
   omp_lock_t lock;
-  printf("%" PRIu64 ": &lock: %" PRIu64 "\n", ompt_get_thread_data()->value, (uint64_t) &lock);
+  printf("%" PRIu64 ": &lock: %" PRIu64 "\n", ompt_get_thread_data()->value, (ompt_wait_id_t) &lock);
   omp_init_lock(&lock);
   print_fuzzy_address(1);
   omp_set_lock(&lock);
Index: openmp/trunk/runtime/test/ompt/synchronization/nest_lock.c
===================================================================
--- openmp/trunk/runtime/test/ompt/synchronization/nest_lock.c
+++ openmp/trunk/runtime/test/ompt/synchronization/nest_lock.c
@@ -10,7 +10,7 @@
     print_ids(0);
 
   omp_nest_lock_t nest_lock;
-  printf("%" PRIu64 ": &nest_lock: %lli\n", ompt_get_thread_data()->value, (long long) &nest_lock);
+  printf("%" PRIu64 ": &nest_lock: %lli\n", ompt_get_thread_data()->value, (ompt_wait_id_t) &nest_lock);
   omp_init_nest_lock(&nest_lock);
   print_fuzzy_address(1);
   omp_set_nest_lock(&nest_lock);