projects
/
debian
/
gnuradio
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2104a9d
)
Updating all of the QA code that I can actually test to work with the new XML output...
author
Tom Rondeau
<trondeau@vt.edu>
Tue, 5 Oct 2010 00:18:46 +0000
(20:18 -0400)
committer
Tom Rondeau
<trondeau@vt.edu>
Tue, 5 Oct 2010 00:18:46 +0000
(20:18 -0400)
13 files changed:
gr-audio-alsa/src/qa_alsa.py
patch
|
blob
|
history
gr-audio-jack/src/qa_jack.py
patch
|
blob
|
history
gr-audio-oss/src/qa_oss.py
patch
|
blob
|
history
gr-audio-portaudio/src/qa_portaudio.py
patch
|
blob
|
history
gr-cvsd-vocoder/src/python/qa_cvsd_vocoder.py
patch
|
blob
|
history
gr-gsm-fr-vocoder/src/python/qa_gsm_full_rate.py
patch
|
blob
|
history
gr-howto-write-a-block/lib/test_all.cc
patch
|
blob
|
history
gr-pager/python/qa_pager.py
patch
|
blob
|
history
gr-radio-astronomy/src/python/qa_ra.py
patch
|
blob
|
history
gr-trellis/src/python/qa_trellis.py
patch
|
blob
|
history
gr-usrp/src/qa_usrp.py
patch
|
blob
|
history
gr-usrp2/src/qa_usrp2.py
patch
|
blob
|
history
gr-video-sdl/src/qa_video_sdl.py
patch
|
blob
|
history
diff --git
a/gr-audio-alsa/src/qa_alsa.py
b/gr-audio-alsa/src/qa_alsa.py
index f2a480a50beb8625f9f84c3cb5f9271ff644ec06..52dbfdc7a5f782023dce6942407c820e88ac281f 100755
(executable)
--- a/
gr-audio-alsa/src/qa_alsa.py
+++ b/
gr-audio-alsa/src/qa_alsa.py
@@
-1,6
+1,6
@@
#!/usr/bin/env python
#
#!/usr/bin/env python
#
-# Copyright 2005,2007 Free Software Foundation, Inc.
+# Copyright 2005,2007
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-23,7
+23,7
@@
from gnuradio import gr, gr_unittest
import audio_alsa
from gnuradio import gr, gr_unittest
import audio_alsa
-class
qa
_alsa (gr_unittest.TestCase):
+class
test_audio
_alsa (gr_unittest.TestCase):
def setUp (self):
self.tb = gr.top_block ()
def setUp (self):
self.tb = gr.top_block ()
@@
-37,4
+37,4
@@
class qa_alsa (gr_unittest.TestCase):
pass
if __name__ == '__main__':
pass
if __name__ == '__main__':
- gr_unittest.
main (
)
+ gr_unittest.
run(test_audio_alsa, "test_audio_alsa.xml"
)
diff --git
a/gr-audio-jack/src/qa_jack.py
b/gr-audio-jack/src/qa_jack.py
index d8a3aba88b0f7e18e970620969b3a74749611d74..ad6bee27b36756dac137a0cd04b8dfec025ec686 100755
(executable)
--- a/
gr-audio-jack/src/qa_jack.py
+++ b/
gr-audio-jack/src/qa_jack.py
@@
-1,6
+1,6
@@
#!/usr/bin/env python
#
#!/usr/bin/env python
#
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-23,7
+23,7
@@
from gnuradio import gr, gr_unittest
import audio_jack
from gnuradio import gr, gr_unittest
import audio_jack
-class
qa
_jack (gr_unittest.TestCase):
+class
test_audio
_jack (gr_unittest.TestCase):
def setUp (self):
self.tb = gr.top_block ()
def setUp (self):
self.tb = gr.top_block ()
@@
-37,4
+37,4
@@
class qa_jack (gr_unittest.TestCase):
pass
if __name__ == '__main__':
pass
if __name__ == '__main__':
- gr_unittest.
main (
)
+ gr_unittest.
run(test_audio_jack, "test_audio_jack.xml"
)
diff --git
a/gr-audio-oss/src/qa_oss.py
b/gr-audio-oss/src/qa_oss.py
index 5427b50ec3f9932e33ca572a364f7b73edf2fefa..365dabc25e14f7ec907ceaa50068b6da3c6a9483 100755
(executable)
--- a/
gr-audio-oss/src/qa_oss.py
+++ b/
gr-audio-oss/src/qa_oss.py
@@
-1,6
+1,6
@@
#!/usr/bin/env python
#
#!/usr/bin/env python
#
-# Copyright 2005,2007 Free Software Foundation, Inc.
+# Copyright 2005,2007
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-23,7
+23,7
@@
from gnuradio import gr, gr_unittest
import audio_oss
from gnuradio import gr, gr_unittest
import audio_oss
-class
qa
_oss (gr_unittest.TestCase):
+class
test_audio
_oss (gr_unittest.TestCase):
def setUp (self):
self.tb = gr.top_block ()
def setUp (self):
self.tb = gr.top_block ()
@@
-37,4
+37,4
@@
class qa_oss (gr_unittest.TestCase):
pass
if __name__ == '__main__':
pass
if __name__ == '__main__':
- gr_unittest.
main (
)
+ gr_unittest.
run(test_audio_oss, "test_audio_oss.xml"
)
diff --git
a/gr-audio-portaudio/src/qa_portaudio.py
b/gr-audio-portaudio/src/qa_portaudio.py
index f6a54061ead92be0120444f6ebb1bd0fa8f692c6..20731f38d49ba41c804eb28ee87d89032958c2fb 100755
(executable)
--- a/
gr-audio-portaudio/src/qa_portaudio.py
+++ b/
gr-audio-portaudio/src/qa_portaudio.py
@@
-1,6
+1,6
@@
#!/usr/bin/env python
#
#!/usr/bin/env python
#
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-23,7
+23,7
@@
from gnuradio import gr, gr_unittest
import audio_portaudio
from gnuradio import gr, gr_unittest
import audio_portaudio
-class
qa
_portaudio (gr_unittest.TestCase):
+class
test_audio
_portaudio (gr_unittest.TestCase):
def setUp (self):
self.tb = gr.top_block ()
def setUp (self):
self.tb = gr.top_block ()
@@
-37,4
+37,4
@@
class qa_portaudio (gr_unittest.TestCase):
pass
if __name__ == '__main__':
pass
if __name__ == '__main__':
- gr_unittest.
main (
)
+ gr_unittest.
run(test_audio_portaudio, "test_audio_portaudio.xml"
)
diff --git
a/gr-cvsd-vocoder/src/python/qa_cvsd_vocoder.py
b/gr-cvsd-vocoder/src/python/qa_cvsd_vocoder.py
index 1a39f636e7baae326305aa9b5449aa208d1047e4..99a38d946c1f398dde4e02ee4227f783de3ecbfc 100755
(executable)
--- a/
gr-cvsd-vocoder/src/python/qa_cvsd_vocoder.py
+++ b/
gr-cvsd-vocoder/src/python/qa_cvsd_vocoder.py
@@
-1,6
+1,6
@@
#!/usr/bin/env python
#
#!/usr/bin/env python
#
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-23,7
+23,7
@@
from gnuradio import gr, gr_unittest, blks2
import cvsd_vocoder
from gnuradio import gr, gr_unittest, blks2
import cvsd_vocoder
-class
qa_cvsd_test
(gr_unittest.TestCase):
+class
test_cvsd_vocoder
(gr_unittest.TestCase):
def setUp (self):
self.tb = gr.top_block()
def setUp (self):
self.tb = gr.top_block()
@@
-112,4
+112,4
@@
class qa_cvsd_test (gr_unittest.TestCase):
"""
if __name__ == '__main__':
"""
if __name__ == '__main__':
- gr_unittest.
main (
)
+ gr_unittest.
run(test_cvsd_vocoder, "test_cvsd_vocoder.xml"
)
diff --git
a/gr-gsm-fr-vocoder/src/python/qa_gsm_full_rate.py
b/gr-gsm-fr-vocoder/src/python/qa_gsm_full_rate.py
index ac508407288ef2ecfa4db2b81bc5be5685edc064..4164a1965ddea376a435bebd1b566a8b54c7328d 100755
(executable)
--- a/
gr-gsm-fr-vocoder/src/python/qa_gsm_full_rate.py
+++ b/
gr-gsm-fr-vocoder/src/python/qa_gsm_full_rate.py
@@
-1,6
+1,6
@@
#!/usr/bin/env python
#
#!/usr/bin/env python
#
-# Copyright 2004,2007 Free Software Foundation, Inc.
+# Copyright 2004,2007
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-23,7
+23,7
@@
from gnuradio import gr, gr_unittest
import gsm_full_rate
from gnuradio import gr, gr_unittest
import gsm_full_rate
-class
qa_howto
(gr_unittest.TestCase):
+class
test_gsm_vocoder
(gr_unittest.TestCase):
def setUp (self):
self.tb = gr.top_block ()
def setUp (self):
self.tb = gr.top_block ()
@@
-32,4
+32,4
@@
class qa_howto (gr_unittest.TestCase):
self.tb = None
if __name__ == '__main__':
self.tb = None
if __name__ == '__main__':
- gr_unittest.
main (
)
+ gr_unittest.
run(test_gsm_vocoder, "test_gsm_vocoder.xml"
)
diff --git
a/gr-howto-write-a-block/lib/test_all.cc
b/gr-howto-write-a-block/lib/test_all.cc
index 192c537bc88b935b6a5df4e30ef836ba2db96967..ac1e83839a0fd3003f2aebddb9748eea85b224dc 100644
(file)
--- a/
gr-howto-write-a-block/lib/test_all.cc
+++ b/
gr-howto-write-a-block/lib/test_all.cc
@@
-1,6
+1,6
@@
/* -*- c++ -*- */
/*
/* -*- c++ -*- */
/*
- * Copyright 2009 Free Software Foundation, Inc.
+ * Copyright 2009
,2010
Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
*
* This file is part of GNU Radio
*
@@
-21,16
+21,23
@@
*/
#include <cppunit/TextTestRunner.h>
*/
#include <cppunit/TextTestRunner.h>
+#include <cppunit/XmlOutputter.h>
+#include <gr_unittests.h>
#include <qa_howto.h>
int
main (int argc, char **argv)
{
#include <qa_howto.h>
int
main (int argc, char **argv)
{
-
+ char path[200];
+ get_unittest_path ("gr_howto_write_a_block.xml", path, 200);
+
CppUnit::TextTestRunner runner;
CppUnit::TextTestRunner runner;
+ std::ofstream xmlfile(path);
+ CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile);
runner.addTest(qa_howto::suite ());
runner.addTest(qa_howto::suite ());
+ runner.setOutputter(xmlout);
bool was_successful = runner.run("", false);
bool was_successful = runner.run("", false);
diff --git
a/gr-pager/python/qa_pager.py
b/gr-pager/python/qa_pager.py
index 5bf72b5613d625cc3209b6041b03595c99ee41ae..12a45d4c3392db66ab6beefd651c19d830110901 100755
(executable)
--- a/
gr-pager/python/qa_pager.py
+++ b/
gr-pager/python/qa_pager.py
@@
-1,6
+1,6
@@
#!/usr/bin/env python
#
#!/usr/bin/env python
#
-# Copyright 2004,2006 Free Software Foundation, Inc.
+# Copyright 2004,2006
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-23,7
+23,7
@@
from gnuradio import gr, gr_unittest
import pager_swig
from gnuradio import gr, gr_unittest
import pager_swig
-class
qa_pg
r(gr_unittest.TestCase):
+class
test_page
r(gr_unittest.TestCase):
def setUp (self):
self.tb = gr.top_block ()
def setUp (self):
self.tb = gr.top_block ()
@@
-32,4
+32,4
@@
class qa_pgr(gr_unittest.TestCase):
self.tb = None
if __name__ == '__main__':
self.tb = None
if __name__ == '__main__':
- gr_unittest.
main (
)
+ gr_unittest.
run(test_pager, "test_pager.xml"
)
diff --git
a/gr-radio-astronomy/src/python/qa_ra.py
b/gr-radio-astronomy/src/python/qa_ra.py
index 1c44e23adaeb8445091c5dfedfcabeb0a92099c1..2cb0f42beae5c4a1dbed947b24ffe7eccf455fba 100755
(executable)
--- a/
gr-radio-astronomy/src/python/qa_ra.py
+++ b/
gr-radio-astronomy/src/python/qa_ra.py
@@
-1,6
+1,6
@@
#!/usr/bin/env python
#
#!/usr/bin/env python
#
-# Copyright 2004,2006 Free Software Foundation, Inc.
+# Copyright 2004,2006
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-23,7
+23,7
@@
from gnuradio import gr, gr_unittest
import ra
from gnuradio import gr, gr_unittest
import ra
-class
qa_ra
(gr_unittest.TestCase):
+class
test_radio_astronomy
(gr_unittest.TestCase):
def setUp (self):
self.tb = gr.top_block ()
def setUp (self):
self.tb = gr.top_block ()
@@
-35,4
+35,4
@@
class qa_ra (gr_unittest.TestCase):
pass
if __name__ == '__main__':
pass
if __name__ == '__main__':
- gr_unittest.
main (
)
+ gr_unittest.
run(test_radio_astronomy, "test_radio_astronomy.xml"
)
diff --git
a/gr-trellis/src/python/qa_trellis.py
b/gr-trellis/src/python/qa_trellis.py
index 306bf994df2259fa87811f4f87d1f2245e9a4c5f..cfeefea061371700dd587d50d703dd20273bbef2 100755
(executable)
--- a/
gr-trellis/src/python/qa_trellis.py
+++ b/
gr-trellis/src/python/qa_trellis.py
@@
-1,6
+1,6
@@
#!/usr/bin/env python
#
#!/usr/bin/env python
#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-23,7
+23,7
@@
from gnuradio import gr, gr_unittest
import trellis
from gnuradio import gr, gr_unittest
import trellis
-class
qa
_trellis (gr_unittest.TestCase):
+class
test
_trellis (gr_unittest.TestCase):
def setUp (self):
self.tb = gr.top_block ()
def setUp (self):
self.tb = gr.top_block ()
@@
-68,11
+68,5
@@
class qa_trellis (gr_unittest.TestCase):
i = trellis.interleaver(K,IN)
self.assertEqual((K,IN,DIN),(i.K(),i.INTER(),i.DEINTER()))
i = trellis.interleaver(K,IN)
self.assertEqual((K,IN,DIN),(i.K(),i.INTER(),i.DEINTER()))
-
-
-
-
-
-
if __name__ == '__main__':
if __name__ == '__main__':
- gr_unittest.
main (
)
+ gr_unittest.
run(test_trellis, "test_trellis.xml"
)
diff --git
a/gr-usrp/src/qa_usrp.py
b/gr-usrp/src/qa_usrp.py
index db2d32624ab0dcef8878438641aa246dcdf98b1e..06e630330aaf4feeeae139d54288620e69289d33 100755
(executable)
--- a/
gr-usrp/src/qa_usrp.py
+++ b/
gr-usrp/src/qa_usrp.py
@@
-1,6
+1,6
@@
#!/usr/bin/env python
#
#!/usr/bin/env python
#
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-23,7
+23,7
@@
from gnuradio import gr, gr_unittest
import usrp_swig
from gnuradio import gr, gr_unittest
import usrp_swig
-class
qa
_usrp (gr_unittest.TestCase):
+class
test
_usrp (gr_unittest.TestCase):
def setUp (self):
self.tb = gr.top_block ()
def setUp (self):
self.tb = gr.top_block ()
@@
-37,4
+37,4
@@
class qa_usrp (gr_unittest.TestCase):
pass
if __name__ == '__main__':
pass
if __name__ == '__main__':
- gr_unittest.
main (
)
+ gr_unittest.
run(test_usrp, "test_usrp.xml"
)
diff --git
a/gr-usrp2/src/qa_usrp2.py
b/gr-usrp2/src/qa_usrp2.py
index bc6664a1ba42f72746c035e76e943812ca6625de..cc994b1e9dbcefe2aa3f92930891e0a38ebc4d43 100755
(executable)
--- a/
gr-usrp2/src/qa_usrp2.py
+++ b/
gr-usrp2/src/qa_usrp2.py
@@
-1,6
+1,6
@@
#!/usr/bin/env python
#
#!/usr/bin/env python
#
-# Copyright 2005,2008 Free Software Foundation, Inc.
+# Copyright 2005,2008
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-23,7
+23,7
@@
from gnuradio import gr, gr_unittest
import usrp2
from gnuradio import gr, gr_unittest
import usrp2
-class
qa
_usrp2(gr_unittest.TestCase):
+class
test
_usrp2(gr_unittest.TestCase):
def setUp(self):
self.tb = gr.top_block()
def setUp(self):
self.tb = gr.top_block()
@@
-37,4
+37,4
@@
class qa_usrp2(gr_unittest.TestCase):
pass
if __name__ == '__main__':
pass
if __name__ == '__main__':
- gr_unittest.
main (
)
+ gr_unittest.
run(test_usrp2, "test_usrp2.xml"
)
diff --git
a/gr-video-sdl/src/qa_video_sdl.py
b/gr-video-sdl/src/qa_video_sdl.py
index 98da85f6b32d552be2dc2cf93d422a71e39bef0a..8f82a60b1955f8f2b86d45fffa136acb17a599e8 100755
(executable)
--- a/
gr-video-sdl/src/qa_video_sdl.py
+++ b/
gr-video-sdl/src/qa_video_sdl.py
@@
-1,6
+1,6
@@
#!/usr/bin/env python
#
#!/usr/bin/env python
#
-# Copyright 2006 Free Software Foundation, Inc.
+# Copyright 2006
,2010
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-23,7
+23,7
@@
from gnuradio import gr, gr_unittest
import video_sdl
from gnuradio import gr, gr_unittest
import video_sdl
-class
qa
_video_sdl (gr_unittest.TestCase):
+class
test
_video_sdl (gr_unittest.TestCase):
def setUp (self):
self.tb = gr.top_block ()
def setUp (self):
self.tb = gr.top_block ()
@@
-37,4
+37,4
@@
class qa_video_sdl (gr_unittest.TestCase):
pass
if __name__ == '__main__':
pass
if __name__ == '__main__':
- gr_unittest.
main (
)
+ gr_unittest.
run(test_video_sdl, "test_video_sdl.xml"
)