Merge pull request #6578 from tautschnig/bugfixes/linker-script-testing

tautschnig · web-flow · commit 181ab42800f0 · 2022-01-14T17:03:40.000+01:00
Actually test linker script processing
diff --git a/regression/ansi-c/Makefile b/regression/ansi-c/Makefile
@@ -12,15 +12,14 @@ endif
 ifeq ($(BUILD_ENV_),MSVC)
 	excluded_tests = -X gcc-only
 else
+ifeq ($(BUILD_ENV_),OSX)
 	# In MacOS, a change in the assert.h header file
 	# is causing template errors when exercising the
 	# C++ front end (because of a transitive include
 	# of <type_traits>) for files that include the
 	# <assert.h> or <cassert> headers.
-	OS := $(shell uname)
-	ifeq ($(OS),Darwin)
-		excluded_tests = -X macos-assert-broken
-	endif
+  excluded_tests = -X macos-assert-broken
+endif
 endif
 
 test:
diff --git a/regression/cbmc-cpp/Makefile b/regression/cbmc-cpp/Makefile
@@ -6,15 +6,14 @@ include ../../src/common
 ifeq ($(BUILD_ENV_),MSVC)
 	excluded_tests = -X gcc-only -X winbug
 else
+ifeq ($(BUILD_ENV_),OSX)
 	# In MacOS, a change in the assert.h header file
 	# is causing template errors when exercising the
 	# C++ front end (because of a transitive include
 	# of <type_traits>) for files that include the
 	# <assert.h> or <cassert> headers.
-	OS := $(shell uname)
-	ifeq ($(OS),Darwin)
-		excluded_tests = -X macos-assert-broken
-	endif
+  excluded_tests = -X macos-assert-broken
+endif
 endif
 
 test:
diff --git a/regression/cpp/Makefile b/regression/cpp/Makefile
@@ -12,15 +12,14 @@ endif
 ifeq ($(BUILD_ENV_),MSVC)
 	excluded_tests = -X gcc-only -X winbug
 else
+ifeq ($(BUILD_ENV_),OSX)
 	# In MacOS, a change in the assert.h header file
 	# is causing template errors when exercising the
 	# C++ front end (because of a transitive include
 	# of <type_traits>) for files that include the
 	# <assert.h> or <cassert> headers.
-	OS := $(shell uname)
-	ifeq ($(OS),Darwin)
-		excluded_tests = -X macos-assert-broken
-	endif
+  excluded_tests = -X macos-assert-broken
+endif
 endif
 
 test:
diff --git a/regression/goto-gcc/CMakeLists.txt b/regression/goto-gcc/CMakeLists.txt
@@ -1,7 +1,13 @@
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+  set(not_gnu_ld -X gnu-ld-only)
+else()
+  set(not_gnu_ld "")
+endif()
+
 # TARGET_FILE (as used in other directories) can't be used with goto-gcc as it
 # isn't marked as an executable (target), which CMake requires. Thus construct a
 # path in the same way the symbolic link is created in the goto-cc directory.
-add_test_pl_tests("$<TARGET_FILE_DIR:goto-cc>/goto-gcc")
+add_test_pl_tests("$<TARGET_FILE_DIR:goto-cc>/goto-gcc" ${not_gnu_ld})
 
 add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/archives/libour_archive.a"
     COMMAND "$<TARGET_FILE_DIR:goto-cc>/goto-gcc" -c foo.c
@@ -15,3 +21,11 @@ add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/archives/libour_archive.a
 add_custom_target(libour_archive.a ALL
     DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/archives/libour_archive.a"
 )
+
+if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+  set_property(
+    TEST "goto-gcc-CORE"
+    PROPERTY ENVIRONMENT
+      "PATH=$ENV{PATH}:$<TARGET_FILE_DIR:goto-cc>"
+  )
+endif()
diff --git a/regression/goto-gcc/Makefile b/regression/goto-gcc/Makefile
@@ -9,11 +9,16 @@ test:
 tests.log: ../test.pl
 
 else
+ifeq ($(BUILD_ENV_),OSX)
+  not_gnu_ld = -X gnu-ld-only
+endif
 test: ../../src/goto-cc/goto-gcc
-	@../test.pl -e -p -c ../../../src/goto-cc/goto-gcc
+	@PATH=../../../scripts:$$PATH \
+		../test.pl -e -p -c ../../../src/goto-cc/goto-gcc $(not_gnu_ld)
 
 tests.log: ../test.pl ../../src/goto-cc/goto-gcc
-	@../test.pl -e -p -c ../../../src/goto-cc/goto-gcc
+	@PATH=../../../scripts:$$PATH \
+		../test.pl -e -p -c ../../../src/goto-cc/goto-gcc $(not_gnu_ld)
 
 ../../src/goto-cc/goto-gcc: ../../src/goto-cc/goto-cc
 	@ln -sf goto-cc ../../src/goto-cc/goto-gcc
diff --git a/regression/goto-gcc/linker_script_start+end/main.c b/regression/goto-gcc/linker_script_start+end/main.c
@@ -2,11 +2,13 @@ extern char src_start[];
 extern char src_end[];
 extern char dst_start[];
 
-void *memcpy(void *dest, void *src, unsigned n){
+void *memcpy(void *dest, void *src, unsigned n)
+{
   return (void *)0;
 }
 
-int main(){
+int main()
+{
   memcpy(dst_start, src_start, (unsigned)src_end - (unsigned)src_start);
   return 0;
 }
diff --git a/regression/goto-gcc/linker_script_start+end/script.ld b/regression/goto-gcc/linker_script_start+end/script.ld
diff --git a/regression/goto-gcc/linker_script_start+end/test.desc b/regression/goto-gcc/linker_script_start+end/test.desc
@@ -1,9 +1,10 @@
-CORE
+CORE gnu-ld-only
 main.c
--o out.gb -T script.ld -nostdlib
+-o out.gb -T script.ld -nostdlib -static -Wall
 ^EXIT=0$
 ^SIGNAL=0$
 --
+Problem parsing linker script
 ^warning: ignoring
 ^CONVERSION ERROR$
 --
diff --git a/regression/goto-gcc/linker_script_start+size/main.c b/regression/goto-gcc/linker_script_start+size/main.c
@@ -2,11 +2,13 @@ extern char src_start[];
 extern char src_size[];
 extern char dst_start[];
 
-void *memcpy(void *dest, void *src, unsigned n){
+void *memcpy(void *dest, void *src, unsigned n)
+{
   return (void *)0;
 }
 
-int main(){
+int main()
+{
   memcpy(dst_start, src_start, (unsigned)src_size);
   return 0;
 }
diff --git a/regression/goto-gcc/linker_script_start+size/script.ld b/regression/goto-gcc/linker_script_start+size/script.ld
diff --git a/regression/goto-gcc/linker_script_start+size/test.desc b/regression/goto-gcc/linker_script_start+size/test.desc
@@ -1,9 +1,10 @@
-CORE
+CORE gnu-ld-only
 main.c
--o out.gb -T script.ld -nostdlib
+-o out.gb -T script.ld -nostdlib -static -Wall
 ^EXIT=0$
 ^SIGNAL=0$
 --
+Problem parsing linker script
 ^warning: ignoring
 ^CONVERSION ERROR$
 --
diff --git a/regression/goto-gcc/linker_script_symbol-only/main.c b/regression/goto-gcc/linker_script_symbol-only/main.c
@@ -1,6 +1,7 @@
 extern char sym[];
 
-int main(){
+int main()
+{
   int foo = (int)sym;
   return 0;
 }
diff --git a/regression/goto-gcc/linker_script_symbol-only/script.ld b/regression/goto-gcc/linker_script_symbol-only/script.ld
diff --git a/regression/goto-gcc/linker_script_symbol-only/test.desc b/regression/goto-gcc/linker_script_symbol-only/test.desc
@@ -1,9 +1,10 @@
-CORE
+CORE gnu-ld-only
 main.c
--o out.gb -T script.ld -nostdlib
+-o out.gb -T script.ld -nostdlib -static -Wall
 ^EXIT=0$
 ^SIGNAL=0$
 --
+Problem parsing linker script
 ^warning: ignoring
 ^CONVERSION ERROR$
 --
diff --git a/regression/systemc/Makefile b/regression/systemc/Makefile
@@ -12,15 +12,14 @@ endif
 ifeq ($(BUILD_ENV_),MSVC)
 	excluded_tests = -X gcc-only -X winbug
 else
+ifeq ($(BUILD_ENV_),OSX)
 	# In MacOS, a change in the assert.h header file
 	# is causing template errors when exercising the
 	# C++ front end (because of a transitive include
 	# of <type_traits>) for files that include the
 	# <assert.h> or <cassert> headers.
-	OS := $(shell uname)
-	ifeq ($(OS),Darwin)
-		excluded_tests = -X macos-assert-broken
-	endif
+  excluded_tests = -X macos-assert-broken
+endif
 endif
 
 default: tests.log
diff --git a/src/goto-cc/CMakeLists.txt b/src/goto-cc/CMakeLists.txt
@@ -41,11 +41,18 @@ else()
     COMMAND "${CMAKE_COMMAND}" -E create_symlink
       goto-cc $<TARGET_FILE_DIR:goto-cc>/goto-ld
     BYPRODUCTS ${CMAKE_BINARY_DIR}/bin/goto-ld)
+  add_custom_command(TARGET goto-cc
+    POST_BUILD
+    COMMAND "${CMAKE_COMMAND}" -E copy
+      ${CMAKE_CURRENT_SOURCE_DIR}/../../scripts/ls_parse.py
+      $<TARGET_FILE_DIR:goto-cc>/ls_parse.py
+    BYPRODUCTS ${CMAKE_BINARY_DIR}/bin/ls_parse.py)
 
   install(
     FILES
       ${CMAKE_BINARY_DIR}/bin/goto-ld
       ${CMAKE_BINARY_DIR}/bin/goto-gcc
+      ${CMAKE_BINARY_DIR}/bin/ls_parse.py
     DESTINATION
       ${CMAKE_INSTALL_BINDIR})
 endif()

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,13 @@ extern char src_start[];`
`2`	`2`	`extern char src_end[];`
`3`	`3`	`extern char dst_start[];`
`4`	`4`
`5`		`-void memcpy(void dest, void *src, unsigned n){`
	`5`	`+void memcpy(void dest, void *src, unsigned n)`
	`6`	`+{`
`6`	`7`	`return (void *)0;`
`7`	`8`	`}`
`8`	`9`
`9`		`-int main(){`
	`10`	`+int main()`
	`11`	`+{`
`10`	`12`	`memcpy(dst_start, src_start, (unsigned)src_end - (unsigned)src_start);`
`11`	`13`	`return 0;`
`12`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,13 @@ extern char src_start[];`
`2`	`2`	`extern char src_size[];`
`3`	`3`	`extern char dst_start[];`
`4`	`4`
`5`		`-void memcpy(void dest, void *src, unsigned n){`
	`5`	`+void memcpy(void dest, void *src, unsigned n)`
	`6`	`+{`
`6`	`7`	`return (void *)0;`
`7`	`8`	`}`
`8`	`9`
`9`		`-int main(){`
	`10`	`+int main()`
	`11`	`+{`
`10`	`12`	`memcpy(dst_start, src_start, (unsigned)src_size);`
`11`	`13`	`return 0;`
`12`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`extern char sym[];`
`2`	`2`
`3`		`-int main(){`
	`3`	`+int main()`
	`4`	`+{`
`4`	`5`	`int foo = (int)sym;`
`5`	`6`	`return 0;`
`6`	`7`	`}`