nplab
/
m3ua-testtool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

runm3uatest: Avoid having to use a ~/.guile script 

Rather, we can specify the path in which the m3ua-testtool files are
located using the '-d ...' command line argument of runm3uatest
This commit is contained in:
Harald Welte 2017-05-14 22:12:52 +02:00
parent c1f566cc85
commit 5e70f7f905
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.guile Symbolic link
View File

@ -0,0 +1 @@
dotguile

2
dotguile
View File

@ -26,7 +26,7 @@
;;; $Id: dotguile,v 1.1 2012/08/26 21:06:27 tuexen Exp $
;;; Change the following line to reflect where the files are located.
(define dir "/home/laforge/projects/git/m3ua-testtool/")
(define dir "")
(define files (list "common.scm"
"m3ua.scm"
"m3ua-asp-tests.scm"

2
run-all-sgp-tests
View File

@ -38,6 +38,6 @@ set testcases = (m3ua-sgp-aspsm-v-001 \
)
foreach testcase ($testcases)
(runm3uatest -t $timeout $testcase > /dev/tty) >& /dev/null
(./runm3uatest -d . -t $timeout $testcase > /dev/tty) >& /dev/null
sleep $sleeptime
end

2
run-some-asp-tests
View File

@ -15,6 +15,6 @@ set testcases = (m3ua-asp-aspsm-v-002 \
m3ua-asp-mtr-i-002 )
foreach testcase ($testcases)
(runm3uatest -t $timeout $testcase > /dev/tty) >& /dev/null
(./runm3uatest -d . -t $timeout $testcase > /dev/tty) >& /dev/null
sleep $sleeptime
end

2
run-some-sgp-tests
View File

@ -15,6 +15,6 @@ set testcases = (m3ua-sgp-aspsm-v-003 \
m3ua-sgp-asptm-o-001)
foreach testcase ($testcases)
(runm3uatest -t $timeout $testcase > /dev/tty) >& /dev/null
(./runm3uatest -d . -t $timeout $testcase > /dev/tty) >& /dev/null
sleep $sleeptime
end

12
runm3uatest.c
View File

@ -71,10 +71,11 @@ main(int argc, char *argv[]) {
unsigned int timeout;
int status, c;
char command[COMMAND_LENGTH];
char *dir = getenv("HOME");
timeout = TIMEOUT;
while ((c = getopt(argc, argv, "t:")) != -1) {
while ((c = getopt(argc, argv, "t:d:")) != -1) {
switch(c) {
case 'h':
print_usage();
@ -83,6 +84,9 @@ main(int argc, char *argv[]) {
case 't':
timeout = (unsigned int)atoi(optarg);
break;
case 'd':
dir = optarg;
break;
default:
print_usage();
return (1);
@ -90,7 +94,7 @@ main(int argc, char *argv[]) {
}
if (optind == argc - 1) {
snprintf(command, COMMAND_LENGTH, command_skel, getenv("HOME"), argv[optind]);
snprintf(command, COMMAND_LENGTH, command_skel, dir, argv[optind]);
} else {
print_usage();
return (1);
@ -98,9 +102,9 @@ main(int argc, char *argv[]) {
if ((pid = fork()) == 0) {
#if defined(__APPLE__) || defined(__FreeBSD__)
execlp("/usr/local/bin/guile", "guile", "-c", command, NULL);
execlp("/usr/local/bin/guile", "guile", "-L", dir, "-c", command, NULL);
#else
execlp("/usr/bin/guile", "guile", "-c", command, NULL);
execlp("/usr/bin/guile", "guile", "-L", dir, "-c", command, NULL);
#endif
return (255);
}