a68: fix modules testsuite to not include flags in test name [PR algol68/123131]

Signed-off-by: Jose E. Marchesi <[email protected]>

gcc/testsuite/ChangeLog

	PR algol68/123131
	* algol68/compile/modules/compile.exp: Pass module include path
	via extra_flags to algol68-dg-runtest.
	* algol68/execute/modules/execute.exp: Pass module include path
	via algol68_compile_args.
	* lib/algol68-dg.exp (MODULES_OPTIONS): Delete.
	(algol68-dg-runtest): Do not use MODULE_OPTIONS.
	* lib/algol68-torture.exp (BUILT_MODULES_DIR): Delete.
	(algol68-torture-execute): Do not use BUILT_MODULES_DIR.

Author: jemarch

gcc/testsuite/algol68/compile/modules/compile.exp

@@ -26,14 +26,11 @@ dg-init
 # The programs need to be able to find the built modules, which are
 # left in objdir.
 
-global MODULES_OPTIONS
-set MODULES_OPTIONS "-I $objdir"
-
 # Main loop.
 set saved-dg-do-what-default ${dg-do-what-default}
 
 set dg-do-what-default "compile"
-algol68-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/program*.a68]] "" ""
+algol68-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/program*.a68]] "" "-I $objdir"
 set dg-do-what-default ${saved-dg-do-what-default}
 
 # All done.

gcc/testsuite/algol68/execute/modules/execute.exp

@@ -25,16 +25,12 @@ load_lib torture-options.exp
 torture-init
 set-torture-options $TORTURE_OPTIONS
 
-# The programs need to be able to find the built modules, which are
-# left in objdir.
-global BUILT_MODULES_DIR
-set BUILT_MODULES_DIR "$objdir"
-
 foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/program-*.a68]] {
     # If we're only testing specific files and this isn't one of them, skip it.
     if ![runtest_file_p $runtests $testcase] then {
 	continue
     }
+    set algol68_compile_args "-I$objdir"
     algol68-torture-execute $testcase
     set algol68_compile_args ""
 }

gcc/testsuite/lib/algol68-dg.exp

@@ -26,15 +26,11 @@ proc algol68-dg-prune { system text } {
     return [gcc-dg-prune $system $text]
 }
 
-# Global modules options
-set MODULES_OPTIONS ""
-
 # Modified dg-runtest that can cycle through a list of optimization options
 # as c-torture does.
 proc algol68-dg-runtest { testcases flags default-extra-flags } {
     global runtests
     global TORTURE_OPTIONS
-    global MODULES_OPTIONS
 
     foreach test $testcases {
 	# If we're only testing specific files and this isn't one of
@@ -55,7 +51,7 @@ proc algol68-dg-runtest { testcases flags default-extra-flags } {
 
 	foreach flags_t $option_list {
 	    verbose "Testing $nshort, $flags $flags_t" 1
-	    dg-test $test "$MODULES_OPTIONS $flags $flags_t" ${default-extra-flags}
+	    dg-test $test "$flags $flags_t" ${default-extra-flags}
 	}
     }
 }

gcc/testsuite/lib/algol68-torture.exp

@@ -42,9 +42,6 @@ if ![info exists TORTURE_OPTIONS] {
     }
 }
 
-# Location of built modules
-set BUILT_MODULES_DIR ""
-
 # Build a series of modules ACCESSed by this test.
 #
 # The first to dg-modules is a list of module names.  The source file
@@ -285,9 +282,6 @@ proc algol68-torture-execute { src } {
 	if { $algol68_compile_args != "" } {
 	    lappend options "additional_flags=$algol68_compile_args"
 	}
-	if { $BUILT_MODULES_DIR != "" } {
-	    lappend options "additional_flags=-I$BUILT_MODULES_DIR"
-	}
 	if { $algol68_module_objects != "" } {
 	    lappend options "additional_flags=$algol68_module_objects"
 	}