URL
https://opencores.org/ocsvn/openrisc_me/openrisc_me/trunk
Subversion Repositories openrisc_me
Compare Revisions
- This comparison shows the changes necessary to convert path
/openrisc/trunk/or1ksim/testsuite/lib
- from Rev 93 to Rev 95
- ↔ Reverse comparison
Rev 93 → Rev 95
/or1ksim.exp
33,20 → 33,19
# !@param[in] progname The program image to use on Or1ksim |
# ----------------------------------------------------------------------------- |
proc run_or1ksim { testname match_list config_file progname } { |
global error_spawn_id |
global spawn_id |
global verbose |
global env |
global srcdir |
global objdir |
|
# Construct the filename |
if {0 == [string length $config_file]} { |
set config_full_file "$env(srcdir)/or1ksim.tests/default.cfg"; |
set config_full_file "$srcdir/or1ksim.tests/default.cfg"; |
} else { |
set config_full_file "$env(srcdir)/or1ksim.tests/$config_file"; |
set config_full_file "$srcdir/or1ksim.tests/$config_file"; |
} |
|
set prog_full_name "./test-code-or1k/$progname" |
set command_line "../sim -f $config_full_file $prog_full_name" |
set prog_full_name "$objdir/test-code-or1k/$progname" |
set command_line "$objdir/../sim -f $config_full_file $prog_full_name" |
|
if { $verbose > 1 } { |
send_user "starting $command_line\n" |
87,8 → 86,7
} |
|
timeout { |
perror "Timeout"; |
fail "$testname: timeout"; |
unresolved "$testname: timeout"; |
return |
} |
} |
/Makefile.in
140,10 → 140,12
PACKAGE_NAME = @PACKAGE_NAME@ |
PACKAGE_STRING = @PACKAGE_STRING@ |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
PACKAGE_URL = @PACKAGE_URL@ |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
POW_LIB = @POW_LIB@ |
RANLIB = @RANLIB@ |
RUNTESTDEFAULTFLAGS = @RUNTESTDEFAULTFLAGS@ |
SED = @SED@ |
SET_MAKE = @SET_MAKE@ |
SHELL = @SHELL@ |
/libsim.exp
35,10 → 35,9
#! @param[in] args Any other arguments |
# ----------------------------------------------------------------------------- |
proc run_libsim { testname match_list libprog config or1kprog args } { |
global error_spawn_id |
global spawn_id |
global verbose |
global env |
global srcdir |
global objdir |
|
# Construct the config filename or use the default |
if {0 == [string length $config]} { |
45,9 → 44,9
set config "default.cfg"; |
} |
|
set libprog_name "./test-code/$libprog" |
set config_name "$env(srcdir)/libsim.tests/$config"; |
set or1kprog_name "./test-code-or1k/$or1kprog" |
set libprog_name "$objdir/test-code/$libprog" |
set config_name "$srcdir/libsim.tests/$config"; |
set or1kprog_name "$objdir/test-code-or1k/$or1kprog" |
|
set command_line "$libprog_name $config_name $or1kprog_name $args" |
|
93,7 → 92,7
|
timeout { |
perror "Timeout"; |
fail "$testname: timeout"; |
unresolved "$testname: timeout"; |
return |
} |
} |