Re: recent dejagnu changes

Re: recent dejagnu changes

[Jimmy Guo]

I will submit a patch retaining the *dir_to_run change, and let Geoff try
it in GCC testing to make sure it works.

The solution to support both existing GCC and GDB test trees would be to
eliminate ${test_top_dirs} entries with common path prefix after
${srcdir} (keeping the parent only).  I will cook up a separate patch for
this.

- Jimmy

On Sat, 5 Aug 2000, Fernando Nasser wrote:

>Geoff Keating wrote:
>> 
>> > Actually, the dir_to_run and cmdline_dir_to_run change is OK ... that
>> > allows specification of a list of test suites, instead of one at a time.
>> 
>We do want to retain this functionality.
>
>> Could you post these as a separate patch, and test them separately?
>> They were committed together, and it's difficult to know which part
>> of the commit belongs with which change.
>> 
>Better than that would be if Jimmy submitted a patch commenting out (with the
>explanation why) the code that he believes is the offending one.  If that passes
>the gcc testsuite tests we commit it.
>
>I wonder if there isn't a way to accomodate both the gcc tree structure and the HP one...

[RFA] dejagnu runtest.exp *dir_to_run

[Jimmy Guo]

Here is the part of the changes backed out.

Geoff, I'd appreciate if you can try GCC testing with this patch and
report back the outcome ... I don't expect that you'd see any problem
but just to play it extra safe ...

- Jimmy Guo, guo@cup.hp.com


2000-08-07	Jimmy Guo	<guo@cup.hp.com>

	Re-apply this change which needn't be backed out:

	* runtest.exp: Handle multiple directories in TCL variables
	dir_to_run and cmdline_dir_to_run.


Index: runtest.exp
===================================================================
RCS file: /cvs/src/src/dejagnu/runtest.exp,v
retrieving revision 1.4
diff -c -r1.4 runtest.exp
*** runtest.exp	2000/08/05 06:34:02	1.4
--- runtest.exp	2000/08/07 17:53:42
***************
*** 1730,1736 ****
  		    # value (for example in MULTIPASS) and the test
  		    # directory matches that directory.
  		    if {[info exists dir_to_run] && $dir_to_run != ""} {
! 			if ![string match "*${dir_to_run}*" $dir] {
  			    continue
  			}
  		    }
--- 1730,1745 ----
  		    # value (for example in MULTIPASS) and the test
  		    # directory matches that directory.
  		    if {[info exists dir_to_run] && $dir_to_run != ""} {
! 			# JYG: dir_to_run might be a space delimited list
! 			# of directories.  Look for match on each item.
! 			set found 0
! 			foreach directory $dir_to_run {
! 			    if [string match "*${directory}*" $dir] {
! 				set found 1
! 				break
! 			    }
! 			}
! 			if {!$found} {
  			    continue
  			}
  		    }
***************
*** 1740,1746 ****
  		    # directory matches that directory
  		    if {[info exists cmdline_dir_to_run] \
  			    && $cmdline_dir_to_run != ""} {
! 			if ![string match "*${cmdline_dir_to_run}*" $dir] {
  			    continue
  			}
  		    }
--- 1749,1764 ----
  		    # directory matches that directory
  		    if {[info exists cmdline_dir_to_run] \
  			    && $cmdline_dir_to_run != ""} {
! 			# JYG: cmdline_dir_to_run might be a space delimited
! 			# list of directories.  Look for match on each item.
! 			set found 0
! 			foreach directory $cmdline_dir_to_run {
! 			    if [string match "*${directory}*" $dir] {
! 				set found 1
! 				break
! 			    }
! 			}
! 			if {!$found} {
  			    continue
  			}
  		    }

[RFA] dejagnu runtest.exp redundant testing

[Jimmy Guo]

Here is the runtest.exp patch which fixes the redundant testing problem
without violating the assumption that any *.exp file under a ${tool}*
directory tree is a valid test file.

Geoff, please try it against GCC testing to see if I break something
this time.  Thanks!

- Jimmy

2000-08-07	Jimmy Guo	<guo@cup.hp.com>

	* runtest.exp: Eliminate from test_top_dirs entries that
	cause redundant testing.  Entries picked up because of their
	${tool} prefix under the real top dir with the ${tool} prefix
	have been making dejagnu run tests under these entries twice,
	since dejagnu treats all *.exp files under a given directory
	tree as test files.

*** runtest.exp.orig	Mon Aug  7 11:01:57 2000
--- runtest.exp	Mon Aug  7 11:21:57 2000
***************
*** 1664,1669 ****
--- 1664,1689 ----
  	set test_top_dirs [lsort [getdirs -all ${srcdir} "${tool}*"]]
  	if { ${test_top_dirs} == "" } {
  	    set test_top_dirs ${srcdir}
+ 	} else {
+ 	    # JYG: For test tree layouts with ${tool} prefix on
+ 	    # both a parent and a child directory, eliminate
+ 	    # the child directory entry from test_top_dirs list.
+ 	    # e.g. gdb.hp/gdb.base-hp/ would result in two entries
+ 	    # in the list: gdb.hp, gdb.hp/gdb.base-hp.
+ 	    # If the latter not eliminated, test files under
+ 	    # gdb.hp/gdb.base-hp would be run twice, since test files
+ 	    # are gathered from all sub-directories underneath a
+ 	    # directory.
+ 	    set temp_top_dirs ""
+ 	    foreach dir "${test_top_dirs}" {
+ 		if [regexp "${srcdir}/.*${tool}.*/.*${tool}" ${dir}] {
+ 		    # skip this directory.
+ 		    continue
+ 		} else {
+ 		    lappend temp_top_dirs ${dir}
+ 		}
+ 	    }
+ 	    set test_top_dirs ${temp_top_dirs}
  	}
  	verbose "Top level testsuite dirs are ${test_top_dirs}" 2
  	set testlist "";

(withdraw) Re: [RFA] dejagnu runtest.exp redundant testing

[Jimmy Guo]

I withdraw this patch.  g++ testing reviewed the problem with it -- when
${tool} contains ?*+ chars, TCL will choke on the regexp command below.

I'll post a replacement patch shortly after the new round of
verification on gdb and gcc / g++ testsuites.

- Jimmy

>2000-08-07	Jimmy Guo	<guo@cup.hp.com>
>
>	* runtest.exp: Eliminate from test_top_dirs entries that
>	cause redundant testing.  Entries picked up because of their
>	${tool} prefix under the real top dir with the ${tool} prefix
>	have been making dejagnu run tests under these entries twice,
>	since dejagnu treats all *.exp files under a given directory
>	tree as test files.
>
>*** runtest.exp.orig	Mon Aug  7 11:01:57 2000
>--- runtest.exp	Mon Aug  7 11:21:57 2000
>***************
>*** 1664,1669 ****
>--- 1664,1689 ----
>  	set test_top_dirs [lsort [getdirs -all ${srcdir} "${tool}*"]]
>  	if { ${test_top_dirs} == "" } {
>  	    set test_top_dirs ${srcdir}
>+ 	} else {
>+ 	    # JYG: For test tree layouts with ${tool} prefix on
>+ 	    # both a parent and a child directory, eliminate
>+ 	    # the child directory entry from test_top_dirs list.
>+ 	    # e.g. gdb.hp/gdb.base-hp/ would result in two entries
>+ 	    # in the list: gdb.hp, gdb.hp/gdb.base-hp.
>+ 	    # If the latter not eliminated, test files under
>+ 	    # gdb.hp/gdb.base-hp would be run twice, since test files
>+ 	    # are gathered from all sub-directories underneath a
>+ 	    # directory.
>+ 	    set temp_top_dirs ""
>+ 	    foreach dir "${test_top_dirs}" {
>+ 		if [regexp "${srcdir}/.*${tool}.*/.*${tool}" ${dir}] {
>+ 		    # skip this directory.
>+ 		    continue
>+ 		} else {
>+ 		    lappend temp_top_dirs ${dir}
>+ 		}
>+ 	    }
>+ 	    set test_top_dirs ${temp_top_dirs}
>  	}
>  	verbose "Top level testsuite dirs are ${test_top_dirs}" 2
>  	set testlist "";

Re: [RFA] dejagnu runtest.exp *dir_to_run

[Jimmy Guo]

I've committed this patch.

- Jimmy

>2000-08-07	Jimmy Guo	<guo@cup.hp.com>
>
>	Re-apply this change which needn't be backed out:
>
>	* runtest.exp: Handle multiple directories in TCL variables
>	dir_to_run and cmdline_dir_to_run.
>
>
>Index: runtest.exp
>===================================================================
>RCS file: /cvs/src/src/dejagnu/runtest.exp,v
>retrieving revision 1.4
>diff -c -r1.4 runtest.exp
>*** runtest.exp	2000/08/05 06:34:02	1.4
>--- runtest.exp	2000/08/07 17:53:42
>***************
>*** 1730,1736 ****
>  		    # value (for example in MULTIPASS) and the test
>  		    # directory matches that directory.
>  		    if {[info exists dir_to_run] && $dir_to_run != ""} {
>! 			if ![string match "*${dir_to_run}*" $dir] {
>  			    continue
>  			}
>  		    }
>--- 1730,1745 ----
>  		    # value (for example in MULTIPASS) and the test
>  		    # directory matches that directory.
>  		    if {[info exists dir_to_run] && $dir_to_run != ""} {
>! 			# JYG: dir_to_run might be a space delimited list
>! 			# of directories.  Look for match on each item.
>! 			set found 0
>! 			foreach directory $dir_to_run {
>! 			    if [string match "*${directory}*" $dir] {
>! 				set found 1
>! 				break
>! 			    }
>! 			}
>! 			if {!$found} {
>  			    continue
>  			}
>  		    }
>***************
>*** 1740,1746 ****
>  		    # directory matches that directory
>  		    if {[info exists cmdline_dir_to_run] \
>  			    && $cmdline_dir_to_run != ""} {
>! 			if ![string match "*${cmdline_dir_to_run}*" $dir] {
>  			    continue
>  			}
>  		    }
>--- 1749,1764 ----
>  		    # directory matches that directory
>  		    if {[info exists cmdline_dir_to_run] \
>  			    && $cmdline_dir_to_run != ""} {
>! 			# JYG: cmdline_dir_to_run might be a space delimited
>! 			# list of directories.  Look for match on each item.
>! 			set found 0
>! 			foreach directory $cmdline_dir_to_run {
>! 			    if [string match "*${directory}*" $dir] {
>! 				set found 1
>! 				break
>! 			    }
>! 			}
>! 			if {!$found} {
>  			    continue
>  			}
>  		    }
>
>