Fixed dynlib Windows issues after merge.
Signed-off-by: Martin Bremmer <martin.bremmer@adlinktech.com>
This commit is contained in:
		
							parent
							
								
									3fc777e631
								
							
						
					
					
						commit
						09eba90c90
					
				
					 3 changed files with 56 additions and 69 deletions
				
			
		| 
						 | 
				
			
			@ -10,6 +10,7 @@
 | 
			
		|||
# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 | 
			
		||||
#
 | 
			
		||||
include(CUnit)
 | 
			
		||||
include(GenerateExportHeader)
 | 
			
		||||
include(GenerateDummyExportHeader)
 | 
			
		||||
 | 
			
		||||
list(APPEND sources
 | 
			
		||||
| 
						 | 
				
			
			@ -90,10 +91,7 @@ generate_dummy_export_header(
 | 
			
		|||
  BASE_NAME dds
 | 
			
		||||
  EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/include/dds/export.h")
 | 
			
		||||
 | 
			
		||||
generate_dummy_export_header(
 | 
			
		||||
  ${test_lib_name}
 | 
			
		||||
  BASE_NAME lib_test
 | 
			
		||||
  EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/lib_test_export.h")
 | 
			
		||||
generate_export_header(${test_lib_name} BASE_NAME LIB_TEST)
 | 
			
		||||
 | 
			
		||||
if(HAVE_MULTI_PROCESS)
 | 
			
		||||
  # A separate application is required to test process management.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -185,14 +185,3 @@ CU_Test(ddsrt_library, dlclose_error)
 | 
			
		|||
    CU_ASSERT_EQUAL(r, DDS_RETCODE_ERROR);
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
CU_Test(ddsrt_library, dlerror_notfound)
 | 
			
		||||
{
 | 
			
		||||
    char buffer[256];
 | 
			
		||||
    dds_return_t r;
 | 
			
		||||
    ddsrt_dlerror(buffer, sizeof(buffer));
 | 
			
		||||
    r = ddsrt_dlerror(buffer, sizeof(buffer));
 | 
			
		||||
    CU_ASSERT_EQUAL(r, DDS_RETCODE_NOT_FOUND);
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue