sua-test: Port over to generate junit-xml for jenkins integration
This commit is contained in:
parent
c0cc3de942
commit
9b4749dad2
|
|
@ -1,23 +0,0 @@
|
|||
From f3a0f7543e8bf36a80d22a7928a4e8c1d91e81ff Mon Sep 17 00:00:00 2001
|
||||
From: Harald Welte <laforge@gnumonks.org>
|
||||
Date: Mon, 17 Apr 2017 10:37:17 +0200
|
||||
Subject: [PATCH 1/2] Fix copy+paste mistake from m3ua in runner script
|
||||
|
||||
---
|
||||
run-some-sua-sgp-tests | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/run-some-sua-sgp-tests b/run-some-sua-sgp-tests
|
||||
index df222f6..7086977 100755
|
||||
--- a/run-some-sua-sgp-tests
|
||||
+++ b/run-some-sua-sgp-tests
|
||||
@@ -31,5 +31,5 @@ set timeout = 10
|
||||
set testcases = ( )
|
||||
|
||||
foreach testcase ($testcases)
|
||||
- (runm3uatest -t $timeout $testcase > /dev/tty) >& /dev/null
|
||||
+ (run-sua-test -t $timeout $testcase > /dev/tty) >& /dev/null
|
||||
end
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From 1da5c06540daf6223eed3a8bc2b0aa0ac4a0182b Mon Sep 17 00:00:00 2001
|
||||
From: Harald Welte <laforge@gnumonks.org>
|
||||
Date: Mon, 17 Apr 2017 10:37:44 +0200
|
||||
Subject: [PATCH 2/2] port "guile executable path" hack for non-macos from
|
||||
m3ua-testtool
|
||||
|
||||
I think it's a bad idea to make assumptions where the executalbe of the
|
||||
guile interpreter lives, but in any case, let's at least make
|
||||
m3ua-testtool and sua-testtool behave consistently here.
|
||||
---
|
||||
run-sua-test.c | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/run-sua-test.c b/run-sua-test.c
|
||||
index 9b49891..f8a4e36 100644
|
||||
--- a/run-sua-test.c
|
||||
+++ b/run-sua-test.c
|
||||
@@ -97,9 +97,11 @@ main(int argc, char *argv[]) {
|
||||
}
|
||||
|
||||
if ((pid = fork()) == 0) {
|
||||
- execlp("/usr/local/bin/guile", "guile",
|
||||
- "-c", command,
|
||||
- (char *)0);
|
||||
+#if defined(__APPLE__) || defined(__FreeBSD__)
|
||||
+ execlp("/usr/local/bin/guile", "guile", "-c", command, NULL);
|
||||
+#else
|
||||
+ execlp("/usr/bin/guile", "guile", "-c", command, NULL);
|
||||
+#endif
|
||||
fprintf(stderr, "%s\n", "Couln't start guile.");
|
||||
}
|
||||
printf("Test %-40.40s ", argv[optind]);
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
|
@ -2,18 +2,11 @@ FROM laforge/sigtran-tests
|
|||
|
||||
MAINTAINER Harald Welte <laforge@gnumonks.org>
|
||||
|
||||
COPY *.patch /tmp/
|
||||
|
||||
RUN git config --global user.email "nobody@localhost" && \
|
||||
git config --global user.name "Docker Container"
|
||||
|
||||
RUN cd /tmp && git clone https://github.com/nplab/sua-testtool
|
||||
RUN cd /tmp && git clone git://git.osmocom.org/nplab/sua-testtool
|
||||
ADD http://git.osmocom.org/nplab/sua-testtool/patch /tmp/commit
|
||||
RUN cd /tmp/sua-testtool && \
|
||||
git pull && \
|
||||
git am /tmp/*.patch && \
|
||||
cc -o run-sua-test run-sua-test.c && \
|
||||
cp run-sua-test /usr/local/bin/
|
||||
cp runtest-junitxml.py /usr/local/bin/
|
||||
|
||||
COPY dotguile /root/.guile
|
||||
|
||||
|
|
@ -21,6 +14,6 @@ RUN mkdir /data
|
|||
|
||||
VOLUME /data
|
||||
|
||||
COPY sua-param-testtool-sgp.scm run-some-sua-sgp-tests /data/
|
||||
COPY sua-param-testtool-sgp.scm some-sua-sgp-tests.txt /data/
|
||||
|
||||
CMD /data/run-some-sua-sgp-tests
|
||||
CMD /usr/local/bin/runtest-junitxml.py -s 0.1 -t 10 -d /root /data/some-sua-sgp-tests.txt
|
||||
|
|
|
|||
|
|
@ -1,62 +0,0 @@
|
|||
#!/usr/bin/env csh
|
||||
#
|
||||
# Copyright (c) 2011 Michael Tuexen
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
# SUCH DAMAGE.
|
||||
#
|
||||
# $Id: run-some-sua-sgp-tests,v 1.3 2011/03/20 16:53:06 tuexen Exp $
|
||||
#
|
||||
|
||||
set timeout = 10
|
||||
set testcases = ( sua-sgp-aspsm-v-01 \
|
||||
sua-sgp-aspsm-v-02 \
|
||||
sua-sgp-aspsm-v-03 \
|
||||
sua-sgp-aspsm-i-01 \
|
||||
sua-sgp-aspsm-i-02 \
|
||||
sua-sgp-aspsm-i-04 \
|
||||
sua-sgp-aspsm-o-01 \
|
||||
sua-sgp-aspsm-o-02 \
|
||||
sua-sgp-aspsm-o-03 \
|
||||
sua-sgp-asptm-v-01 \
|
||||
sua-sgp-asptm-v-02 \
|
||||
sua-sgp-asptm-v-04 \
|
||||
sua-sgp-asptm-v-05 \
|
||||
sua-sgp-asptm-v-06 \
|
||||
sua-sgp-asptm-v-07 \
|
||||
sua-sgp-asptm-i-01 \
|
||||
sua-sgp-asptm-i-03 \
|
||||
sua-sgp-asptm-i-04 \
|
||||
sua-sgp-asptm-i-05 \
|
||||
sua-sgp-asptm-i-06 \
|
||||
sua-sgp-asptm-i-08 \
|
||||
sua-sgp-asptm-o-01 \
|
||||
sua-sgp-asptm-o-02 \
|
||||
sua-sgp-mtr-i-01 \
|
||||
sua-sgp-mtr-i-02 \
|
||||
sua-sgp-mtr-i-03 \
|
||||
sua-sgp-mtr-i-04 \
|
||||
)
|
||||
|
||||
foreach testcase ($testcases)
|
||||
(run-sua-test -t $timeout $testcase > /dev/tty) >& /dev/null
|
||||
end
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
sua-sgp-aspsm-v-01
|
||||
sua-sgp-aspsm-v-02
|
||||
sua-sgp-aspsm-v-03
|
||||
sua-sgp-aspsm-i-01
|
||||
sua-sgp-aspsm-i-02
|
||||
sua-sgp-aspsm-i-04
|
||||
sua-sgp-aspsm-o-01
|
||||
sua-sgp-aspsm-o-02
|
||||
sua-sgp-aspsm-o-03
|
||||
sua-sgp-asptm-v-01
|
||||
sua-sgp-asptm-v-02
|
||||
sua-sgp-asptm-v-04
|
||||
sua-sgp-asptm-v-05
|
||||
sua-sgp-asptm-v-06
|
||||
sua-sgp-asptm-v-07
|
||||
sua-sgp-asptm-i-01
|
||||
sua-sgp-asptm-i-03
|
||||
sua-sgp-asptm-i-04
|
||||
sua-sgp-asptm-i-05
|
||||
sua-sgp-asptm-i-06
|
||||
sua-sgp-asptm-i-08
|
||||
sua-sgp-asptm-o-01
|
||||
sua-sgp-asptm-o-02
|
||||
sua-sgp-mtr-i-01
|
||||
sua-sgp-mtr-i-02
|
||||
sua-sgp-mtr-i-03
|
||||
sua-sgp-mtr-i-04
|
||||
Loading…
Reference in New Issue