diff options
| author | Chris Johns <chrisj@rtems.org> | 2023-03-27 16:25:19 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2023-03-27 16:47:29 +1100 |
| commit | 5cd6d2df5cc1fef3b6bf272c56f6488cb1b2e847 (patch) | |
| tree | 9ee1aa5a6c8c931e7bdf4901d0b2bc9be47ecec6 /testsuites | |
| parent | waf: Reformat to the PEP 8 coding style (diff) | |
| download | rtems-net-legacy-5cd6d2df5cc1fef3b6bf272c56f6488cb1b2e847.tar.bz2 | |
waf: List all source built and installed
- Remove scanning the file system for files to build and install.
- Install list checked against an RTEMS 5.3 networking build.
Closes #4887
Diffstat (limited to 'testsuites')
| -rw-r--r-- | testsuites/ftp01/wscript | 18 | ||||
| -rw-r--r-- | testsuites/loopback/wscript | 9 | ||||
| -rw-r--r-- | testsuites/networking01/wscript | 9 | ||||
| -rw-r--r-- | testsuites/pppd/wscript | 13 | ||||
| -rw-r--r-- | testsuites/syscall01/wscript | 9 | ||||
| -rw-r--r-- | testsuites/telnetd01/wscript | 17 | ||||
| -rw-r--r-- | testsuites/wscript | 6 |
7 files changed, 39 insertions, 42 deletions
diff --git a/testsuites/ftp01/wscript b/testsuites/ftp01/wscript index 200138e..550b0b5 100644 --- a/testsuites/ftp01/wscript +++ b/testsuites/ftp01/wscript @@ -27,7 +27,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. from rtems_waf import rtems -import os def init(ctx): @@ -39,15 +38,12 @@ def configure(conf): def build(bld): - arch_lib_path = rtems.arch_bsp_lib_path(bld.env.RTEMS_VERSION, - bld.env.RTEMS_ARCH_BSP) - lib_path = os.path.join(bld.env.PREFIX, arch_lib_path) - bld.read_stlib('ftpfs', paths=[lib_path]) - bld.read_stlib('ftpd', paths=[lib_path]) - + source = ['init.c'] bld.program(target='ftp01.exe', features='c cprogram', - cflags=['-O2', '-g'], - includes='. .. ../include ../../', - use=['ftpfs', 'ftpd', 'networking'], - source='init.c') + cflags=bld.env.OPTIMIZATION + ['-g'], + includes=bld.env.IFLAGS, + lib=['ftpfs', 'ftpd', 'networking'], + libpath=['.'], + source=source, + install_path=False) diff --git a/testsuites/loopback/wscript b/testsuites/loopback/wscript index 8ba0443..bc7bd9a 100644 --- a/testsuites/loopback/wscript +++ b/testsuites/loopback/wscript @@ -27,7 +27,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. from rtems_waf import rtems -import os def init(ctx): @@ -39,9 +38,11 @@ def configure(conf): def build(bld): + source = ['init.c'] bld.program(target='loopback.exe', features='c cprogram', - cflags=['-O2', '-g'], - includes='. .. ../include ../../', + cflags=bld.env.OPTIMIZATION + ['-g'], + includes=bld.env.IFLAGS, use=['networking'], - source='init.c') + source=source, + install_path=False) diff --git a/testsuites/networking01/wscript b/testsuites/networking01/wscript index f91a5f8..d9917ff 100644 --- a/testsuites/networking01/wscript +++ b/testsuites/networking01/wscript @@ -27,7 +27,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. from rtems_waf import rtems -import os def init(ctx): @@ -39,9 +38,11 @@ def configure(conf): def build(bld): + source = ['init.c'] bld.program(target='networking01.exe', features='c cprogram', - cflags=['-O2', '-g'], - includes='. .. ../include ../../', + cflags=bld.env.OPTIMIZATION + ['-g'], + includes=bld.env.IFLAGS, use=['networking'], - source='init.c') + source=source, + install_path=False) diff --git a/testsuites/pppd/wscript b/testsuites/pppd/wscript index cd57444..a99cf5e 100644 --- a/testsuites/pppd/wscript +++ b/testsuites/pppd/wscript @@ -27,7 +27,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. from rtems_waf import rtems -import os def init(ctx): @@ -39,10 +38,12 @@ def configure(conf): def build(bld): + source = ['init.c', 'pppdapp.c'] bld(target='pppd.exe', features='c cprogram', - cflags=['-O2', '-g'], - includes='. .. ../../include ../include ../../', - use=['pppd', 'networking'], - libpath=['.', '../../build'], - source=['init.c', 'pppdapp.c']) + cflags=bld.env.OPTIMIZATION + ['-g'], + includes=bld.env.IFLAGS, + lib=['pppd', 'networking'], + libpath=['.'], + source=source, + install_path=False) diff --git a/testsuites/syscall01/wscript b/testsuites/syscall01/wscript index 5ad2e19..c8fd30b 100644 --- a/testsuites/syscall01/wscript +++ b/testsuites/syscall01/wscript @@ -27,7 +27,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. from rtems_waf import rtems -import os def init(ctx): @@ -39,9 +38,11 @@ def configure(conf): def build(bld): + source = ['init.c'] bld.program(target='syscall01.exe', features='c cprogram', - cflags=['-O2', '-g'], - includes='. .. ../include ../../', + cflags=bld.env.OPTIMIZATION + ['-g'], + includes=bld.env.IFLAGS, use=['networking'], - source='init.c') + source=source, + install_path=False) diff --git a/testsuites/telnetd01/wscript b/testsuites/telnetd01/wscript index f24f2ad..fe8a447 100644 --- a/testsuites/telnetd01/wscript +++ b/testsuites/telnetd01/wscript @@ -27,7 +27,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. from rtems_waf import rtems -import os def init(ctx): @@ -39,14 +38,12 @@ def configure(conf): def build(bld): - arch_lib_path = rtems.arch_bsp_lib_path(bld.env.RTEMS_VERSION, - bld.env.RTEMS_ARCH_BSP) - lib_path = os.path.join(bld.env.PREFIX, arch_lib_path) - bld.read_stlib('telnetd', paths=[lib_path]) - + source = ['init.c'] bld.program(target='telnetd01.exe', features='c cprogram', - cflags=['-O2', '-g'], - includes='. .. ../include ../../ ../../include', - use=['telnetd', 'networking'], - source='init.c') + cflags=bld.env.OPTIMIZATION + ['-g'], + includes=bld.env.IFLAGS, + lib=['telnetd', 'networking'], + libpath=['.'], + source=source, + install_path=False) diff --git a/testsuites/wscript b/testsuites/wscript index 5145e92..040c5c6 100644 --- a/testsuites/wscript +++ b/testsuites/wscript @@ -28,9 +28,9 @@ from rtems_waf import rtems -subdirs = ['ftp01', 'loopback', - 'networking01', 'pppd', - 'syscall01', 'telnetd01'] +subdirs = [ + 'ftp01', 'loopback', 'networking01', 'pppd', 'syscall01', 'telnetd01' +] def recurse(ctx): |