Add RTEMS version support, update all python to 2 and 3.

Add support to force the RTEMS version. This remove the need for using
the --rtems-version command line option if the automatic detection fails.

Update all python code to support python 2 and 3.

Update rtems_waf to the latest version to support the RTEMS version,
check environment variables and to display the CC version.

Sort all tests. I think the unsorted list is dependent on the version
of python and so would result in repo noise as if it regenerted.
This commit is contained in:
Chris Johns
2016-04-18 10:53:20 +10:00
parent 891a7568e5
commit 97c5024a79
8 changed files with 341 additions and 315 deletions

388
wscript
View File

@@ -6,8 +6,12 @@
# To use see README.waf shipped with this file.
#
from __future__ import print_function
import os.path
rtems_version = "4.12"
try:
import rtems_waf.rtems as rtems
except:
@@ -16,7 +20,7 @@ except:
sys.exit(1)
def init(ctx):
rtems.init(ctx)
rtems.init(ctx, version = rtems_version)
def options(opt):
rtems.options(opt)
@@ -179,18 +183,6 @@ def build(bld):
source = "freebsd/lib/libc/net/nslexer.c")
libbsd_use += ["lex__nsyy"]
if bld.env.AUTO_REGEN:
bld(target = "freebsd/lib/libipsec/policy_token.c",
source = "freebsd/lib/libipsec/policy_token.l",
rule = "${LEX} -P __libipsecyy -t ${SRC} | sed -e '/YY_BUF_SIZE/s/16384/1024/' > ${TGT}")
bld.objects(target = "lex___libipsecyy",
features = "c",
cflags = cflags,
includes = [] + includes,
defines = [],
source = "freebsd/lib/libipsec/policy_token.c")
libbsd_use += ["lex___libipsecyy"]
if bld.env.AUTO_REGEN:
bld(target = "freebsd/contrib/libpcap/scanner.c",
source = "freebsd/contrib/libpcap/scanner.l",
@@ -203,6 +195,18 @@ def build(bld):
source = "freebsd/contrib/libpcap/scanner.c")
libbsd_use += ["lex_pcap"]
if bld.env.AUTO_REGEN:
bld(target = "freebsd/lib/libipsec/policy_token.c",
source = "freebsd/lib/libipsec/policy_token.l",
rule = "${LEX} -P __libipsecyy -t ${SRC} | sed -e '/YY_BUF_SIZE/s/16384/1024/' > ${TGT}")
bld.objects(target = "lex___libipsecyy",
features = "c",
cflags = cflags,
includes = [] + includes,
defines = [],
source = "freebsd/lib/libipsec/policy_token.c")
libbsd_use += ["lex___libipsecyy"]
# Yacc
if bld.env.AUTO_REGEN:
bld(target = "freebsd/lib/libipsec/policy_parse.c",
@@ -1131,153 +1135,22 @@ def build(bld):
relative_trick = True)
# Tests
test_init01 = ['testsuite/init01/test_main.c']
bld.program(target = "init01.exe",
test_arphole = ['testsuite/arphole/test_main.c']
bld.program(target = "arphole.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_init01,
source = test_arphole,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_syscalls01 = ['testsuite/syscalls01/test_main.c']
bld.program(target = "syscalls01.exe",
test_commands01 = ['testsuite/commands01/test_main.c']
bld.program(target = "commands01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_syscalls01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_thread01 = ['testsuite/thread01/test_main.c']
bld.program(target = "thread01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_thread01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_loopback01 = ['testsuite/loopback01/test_main.c']
bld.program(target = "loopback01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_loopback01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_foobarclient = ['testsuite/foobarclient/test_main.c']
bld.program(target = "foobarclient.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_foobarclient,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_lagg01 = ['testsuite/lagg01/test_main.c']
bld.program(target = "lagg01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_lagg01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_timeout01 = ['testsuite/timeout01/init.c',
'testsuite/timeout01/timeout_test.c']
bld.program(target = "timeout01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_timeout01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_dhcpcd02 = ['testsuite/dhcpcd02/test_main.c']
bld.program(target = "dhcpcd02.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_dhcpcd02,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_ftpd01 = ['testsuite/ftpd01/test_main.c']
bld.program(target = "ftpd01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_ftpd01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_vlan01 = ['testsuite/vlan01/test_main.c']
bld.program(target = "vlan01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_vlan01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_foobarserver = ['testsuite/foobarserver/test_main.c']
bld.program(target = "foobarserver.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_foobarserver,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_selectpollkqueue01 = ['testsuite/selectpollkqueue01/test_main.c']
bld.program(target = "selectpollkqueue01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_selectpollkqueue01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_zerocopy01 = ['testsuite/zerocopy01/test_main.c']
bld.program(target = "zerocopy01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_zerocopy01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_smp01 = ['testsuite/smp01/test_main.c']
bld.program(target = "smp01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_smp01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_media01 = ['testsuite/media01/test_main.c']
bld.program(target = "media01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_media01,
source = test_commands01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
@@ -1292,33 +1165,102 @@ def build(bld):
lib = ["m", "z"],
install_path = None)
test_telnetd01 = ['testsuite/telnetd01/test_main.c']
bld.program(target = "telnetd01.exe",
test_dhcpcd01 = ['testsuite/dhcpcd01/test_main.c']
bld.program(target = "dhcpcd01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_telnetd01,
source = test_dhcpcd01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_ppp01 = ['testsuite/ppp01/test_main.c']
bld.program(target = "ppp01.exe",
test_dhcpcd02 = ['testsuite/dhcpcd02/test_main.c']
bld.program(target = "dhcpcd02.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_ppp01,
source = test_dhcpcd02,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_swi01 = ['testsuite/swi01/init.c',
'testsuite/swi01/swi_test.c']
bld.program(target = "swi01.exe",
test_foobarclient = ['testsuite/foobarclient/test_main.c']
bld.program(target = "foobarclient.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_swi01,
source = test_foobarclient,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_foobarserver = ['testsuite/foobarserver/test_main.c']
bld.program(target = "foobarserver.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_foobarserver,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_ftpd01 = ['testsuite/ftpd01/test_main.c']
bld.program(target = "ftpd01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_ftpd01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_init01 = ['testsuite/init01/test_main.c']
bld.program(target = "init01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_init01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_lagg01 = ['testsuite/lagg01/test_main.c']
bld.program(target = "lagg01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_lagg01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_loopback01 = ['testsuite/loopback01/test_main.c']
bld.program(target = "loopback01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_loopback01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_media01 = ['testsuite/media01/test_main.c']
bld.program(target = "media01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_media01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_mutex01 = ['testsuite/mutex01/test_main.c']
bld.program(target = "mutex01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_mutex01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
@@ -1334,6 +1276,26 @@ def build(bld):
lib = ["m", "z"],
install_path = None)
test_ping01 = ['testsuite/ping01/test_main.c']
bld.program(target = "ping01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_ping01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_ppp01 = ['testsuite/ppp01/test_main.c']
bld.program(target = "ppp01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_ppp01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_rwlock01 = ['testsuite/rwlock01/test_main.c']
bld.program(target = "rwlock01.exe",
features = "cprogram",
@@ -1344,22 +1306,84 @@ def build(bld):
lib = ["m", "z"],
install_path = None)
test_mutex01 = ['testsuite/mutex01/test_main.c']
bld.program(target = "mutex01.exe",
test_selectpollkqueue01 = ['testsuite/selectpollkqueue01/test_main.c']
bld.program(target = "selectpollkqueue01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_mutex01,
source = test_selectpollkqueue01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_dhcpcd01 = ['testsuite/dhcpcd01/test_main.c']
bld.program(target = "dhcpcd01.exe",
test_sleep01 = ['testsuite/sleep01/test_main.c']
bld.program(target = "sleep01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_dhcpcd01,
source = test_sleep01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_smp01 = ['testsuite/smp01/test_main.c']
bld.program(target = "smp01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_smp01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_swi01 = ['testsuite/swi01/init.c',
'testsuite/swi01/swi_test.c']
bld.program(target = "swi01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_swi01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_syscalls01 = ['testsuite/syscalls01/test_main.c']
bld.program(target = "syscalls01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_syscalls01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_telnetd01 = ['testsuite/telnetd01/test_main.c']
bld.program(target = "telnetd01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_telnetd01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_thread01 = ['testsuite/thread01/test_main.c']
bld.program(target = "thread01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_thread01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_timeout01 = ['testsuite/timeout01/init.c',
'testsuite/timeout01/timeout_test.c']
bld.program(target = "timeout01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_timeout01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
@@ -1374,26 +1398,6 @@ def build(bld):
lib = ["m", "z"],
install_path = None)
test_commands01 = ['testsuite/commands01/test_main.c']
bld.program(target = "commands01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_commands01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_ping01 = ['testsuite/ping01/test_main.c']
bld.program(target = "ping01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_ping01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_usb01 = ['testsuite/usb01/init.c',
'testsuite/usb01/test-file-system.c']
bld.program(target = "usb01.exe",
@@ -1405,22 +1409,22 @@ def build(bld):
lib = ["m", "z"],
install_path = None)
test_arphole = ['testsuite/arphole/test_main.c']
bld.program(target = "arphole.exe",
test_vlan01 = ['testsuite/vlan01/test_main.c']
bld.program(target = "vlan01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_arphole,
source = test_vlan01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)
test_sleep01 = ['testsuite/sleep01/test_main.c']
bld.program(target = "sleep01.exe",
test_zerocopy01 = ['testsuite/zerocopy01/test_main.c']
bld.program(target = "zerocopy01.exe",
features = "cprogram",
cflags = cflags,
includes = includes,
source = test_sleep01,
source = test_zerocopy01,
use = ["bsd"],
lib = ["m", "z"],
install_path = None)