Skip to content

Commit

Permalink
chore(test): add feature for final2
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChenRuiwei
ChenRuiwei committed Aug 19, 2024
1 parent 2f54517 commit 3bac0df
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 300 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ kernel/src/link_app.asm
mnt/
my-test/
ltp/
testcase/24/final_no_ltp
target/
rootfs/
third-party/vendor/
Expand Down
1 change: 1 addition & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export STRACE :=
export SMP :=
export PREEMPT :=
export DEBUG :=
export FINAL2 :=

# Args
DISASM_ARGS = -d
Expand Down
1 change: 1 addition & 0 deletions kernel/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,4 @@ smp = []
preempt = []
debug = []
vf2 = ["config/vf2"]
final2 = []
3 changes: 3 additions & 0 deletions kernel/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ endif
ifneq ($(VF2), )
FEATURES += vf2
endif
ifneq ($(FINAL2), )
FEATURES += final2
endif

CARGO_BUILD_ARGS :=
ifeq ($(MODE), release)
Expand Down
3 changes: 3 additions & 0 deletions kernel/src/task/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ use crate::{
};

pub fn spawn_init_proc() {
#[cfg(not(feature = "final2"))]
let init_proc_path = "/init_proc";
#[cfg(feature = "final2")]
let init_proc_path = "/final_tests";
let args = vec![init_proc_path.to_string()];
let envp = Vec::new();

Expand Down
300 changes: 0 additions & 300 deletions user/src/bin/final_tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,243 +12,6 @@ extern crate user_lib;

const TESTCASES: &[&str] = &[
"time-test",
// "./test-ltp.sh ltp/testcases/bin/abs01",
// "./test-ltp.sh ltp/testcases/bin/accept01",
// "./test-ltp.sh ltp/testcases/bin/alarm02",
// "./test-ltp.sh ltp/testcases/bin/alarm03",
// "./test-ltp.sh ltp/testcases/bin/alarm05",
// "./test-ltp.sh ltp/testcases/bin/alarm06",
// "./test-ltp.sh ltp/testcases/bin/alarm07",
// "./test-ltp.sh ltp/testcases/bin/atof01",
// "./test-ltp.sh ltp/testcases/bin/chown01",
// "./test-ltp.sh ltp/testcases/bin/clock_nanosleep04",
// "./test-ltp.sh ltp/testcases/bin/close01",
// "./test-ltp.sh ltp/testcases/bin/close02",
// "./test-ltp.sh ltp/testcases/bin/clone01",
// "./test-ltp.sh ltp/testcases/bin/clone04",
// "./test-ltp.sh ltp/testcases/bin/confstr01",
// "./test-ltp.sh ltp/testcases/bin/creat03",
// "./test-ltp.sh ltp/testcases/bin/creat05",
// "./test-ltp.sh ltp/testcases/bin/diotest1",
// "./test-ltp.sh ltp/testcases/bin/diotest3",
// "./test-ltp.sh ltp/testcases/bin/diotest6",
// "./test-ltp.sh ltp/testcases/bin/dirty",
// "./test-ltp.sh ltp/testcases/bin/dup01",
// "./test-ltp.sh ltp/testcases/bin/dup02",
// "./test-ltp.sh ltp/testcases/bin/dup03",
// "./test-ltp.sh ltp/testcases/bin/dup04",
// "./test-ltp.sh ltp/testcases/bin/dup06",
// "./test-ltp.sh ltp/testcases/bin/dup07",
// "./test-ltp.sh ltp/testcases/bin/dup201",
// "./test-ltp.sh ltp/testcases/bin/dup202",
// "./test-ltp.sh ltp/testcases/bin/dup203",
// "./test-ltp.sh ltp/testcases/bin/dup204",
// "./test-ltp.sh ltp/testcases/bin/dup205",
// "./test-ltp.sh ltp/testcases/bin/dup206",
// "./test-ltp.sh ltp/testcases/bin/dup207",
// "./test-ltp.sh ltp/testcases/bin/dup3_01",
// "./test-ltp.sh ltp/testcases/bin/dup3_02",
// "./test-ltp.sh ltp/testcases/bin/exit02",
// "./test-ltp.sh ltp/testcases/bin/faccessat01",
// "./test-ltp.sh ltp/testcases/bin/faccessat02",
// "./test-ltp.sh ltp/testcases/bin/fchdir01",
// "./test-ltp.sh ltp/testcases/bin/fchmodat01",
// "./test-ltp.sh ltp/testcases/bin/fchown01",
// "./test-ltp.sh ltp/testcases/bin/fcntl02",
// "./test-ltp.sh ltp/testcases/bin/fcntl02_64",
// "./test-ltp.sh ltp/testcases/bin/fcntl03",
// "./test-ltp.sh ltp/testcases/bin/fcntl03_64",
// "./test-ltp.sh ltp/testcases/bin/fcntl04",
// "./test-ltp.sh ltp/testcases/bin/fcntl04_64",
// "./test-ltp.sh ltp/testcases/bin/fcntl08",
// "./test-ltp.sh ltp/testcases/bin/fcntl08_64",
// "./test-ltp.sh ltp/testcases/bin/fcntl29",
// "./test-ltp.sh ltp/testcases/bin/fcntl29_64",
// "./test-ltp.sh ltp/testcases/bin/fdatasync02",
// "./test-ltp.sh ltp/testcases/bin/flistxattr03",
// "./test-ltp.sh ltp/testcases/bin/flock01",
// "./test-ltp.sh ltp/testcases/bin/fork01",
// "./test-ltp.sh ltp/testcases/bin/fork03",
// "./test-ltp.sh ltp/testcases/bin/fork05",
// "./test-ltp.sh ltp/testcases/bin/fork07",
// "./test-ltp.sh ltp/testcases/bin/fork08",
// "./test-ltp.sh ltp/testcases/bin/fork09",
// "./test-ltp.sh ltp/testcases/bin/fork10",
// "./test-ltp.sh ltp/testcases/bin/fork_procs",
// "./test-ltp.sh ltp/testcases/bin/fpathconf01",
// "./test-ltp.sh ltp/testcases/bin/fptest01",
// "./test-ltp.sh ltp/testcases/bin/fptest02",
// "./test-ltp.sh ltp/testcases/bin/fs_perms",
// "./test-ltp.sh ltp/testcases/bin/futex_wait04",
// "./test-ltp.sh ltp/testcases/bin/genload",
// "./test-ltp.sh ltp/testcases/bin/genlog10",
// "./test-ltp.sh ltp/testcases/bin/getcontext01",
// "./test-ltp.sh ltp/testcases/bin/getcwd02",
// "./test-ltp.sh ltp/testcases/bin/getdomainname01",
// "./test-ltp.sh ltp/testcases/bin/geteuid01",
// "./test-ltp.sh ltp/testcases/bin/gethostbyname_r01",
// "./test-ltp.sh ltp/testcases/bin/gethostname01",
// "./test-ltp.sh ltp/testcases/bin/gethostname02",
// "./test-ltp.sh ltp/testcases/bin/getitimer01",
// "./test-ltp.sh ltp/testcases/bin/getitimer02",
// "./test-ltp.sh ltp/testcases/bin/getpagesize01",
// "./test-ltp.sh ltp/testcases/bin/getpgid02",
// "./test-ltp.sh ltp/testcases/bin/getpgrp01",
// "./test-ltp.sh ltp/testcases/bin/getppid01",
// "./test-ltp.sh ltp/testcases/bin/getrandom02",
// "./test-ltp.sh ltp/testcases/bin/getrandom04",
// "./test-ltp.sh ltp/testcases/bin/getresgid01",
// "./test-ltp.sh ltp/testcases/bin/getresuid01",
// "./test-ltp.sh ltp/testcases/bin/getrlimit01",
// "./test-ltp.sh ltp/testcases/bin/getrusage02",
// "./test-ltp.sh ltp/testcases/bin/gettid02",
// "./test-ltp.sh ltp/testcases/bin/getuid01",
// "./test-ltp.sh ltp/testcases/bin/in6_01",
// "./test-ltp.sh ltp/testcases/bin/ioctl_ns07",
// "./test-ltp.sh ltp/testcases/bin/ioprio_get01",
// "./test-ltp.sh ltp/testcases/bin/ioprio_set02",
// "./test-ltp.sh ltp/testcases/bin/keyctl03",
// "./test-ltp.sh ltp/testcases/bin/keyctl04",
// "./test-ltp.sh ltp/testcases/bin/kill03",
// "./test-ltp.sh ltp/testcases/bin/kill06",
// "./test-ltp.sh ltp/testcases/bin/kill08",
// "./test-ltp.sh ltp/testcases/bin/listen01",
// "./test-ltp.sh ltp/testcases/bin/listxattr03",
// "./test-ltp.sh ltp/testcases/bin/llistxattr03",
// "./test-ltp.sh ltp/testcases/bin/llseek02",
// "./test-ltp.sh ltp/testcases/bin/llseek03",
// "./test-ltp.sh ltp/testcases/bin/locktests",
// "./test-ltp.sh ltp/testcases/bin/lseek01",
// "./test-ltp.sh ltp/testcases/bin/lseek07",
// "./test-ltp.sh ltp/testcases/bin/ltpServer",
// "./test-ltp.sh ltp/testcases/bin/madvise05",
// "./test-ltp.sh ltp/testcases/bin/mallinfo01",
// "./test-ltp.sh ltp/testcases/bin/mallinfo02",
// "./test-ltp.sh ltp/testcases/bin/mallopt01",
// "./test-ltp.sh ltp/testcases/bin/memcmp01",
// "./test-ltp.sh ltp/testcases/bin/memcpy01",
// "./test-ltp.sh ltp/testcases/bin/memset01",
// "./test-ltp.sh ltp/testcases/bin/mkdirat01",
// "./test-ltp.sh ltp/testcases/bin/mlock01",
// "./test-ltp.sh ltp/testcases/bin/mlock04",
// "./test-ltp.sh ltp/testcases/bin/mlockall01",
// "./test-ltp.sh ltp/testcases/bin/mmap01",
// "./test-ltp.sh ltp/testcases/bin/mmap02",
// "./test-ltp.sh ltp/testcases/bin/mmap11",
// "./test-ltp.sh ltp/testcases/bin/mmap19",
// "./test-ltp.sh ltp/testcases/bin/mmap2",
// "./test-ltp.sh ltp/testcases/bin/mmapstress04",
// "./test-ltp.sh ltp/testcases/bin/mmstress_dummy",
// "./test-ltp.sh ltp/testcases/bin/modify_ldt01",
// "./test-ltp.sh ltp/testcases/bin/modify_ldt02",
// "./test-ltp.sh ltp/testcases/bin/modify_ldt03",
// "./test-ltp.sh ltp/testcases/bin/mprotect04",
// "./test-ltp.sh ltp/testcases/bin/msgctl12",
// "./test-ltp.sh ltp/testcases/bin/msync01",
// "./test-ltp.sh ltp/testcases/bin/msync02",
// "./test-ltp.sh ltp/testcases/bin/munlock01",
// "./test-ltp.sh ltp/testcases/bin/newuname01",
// "./test-ltp.sh ltp/testcases/bin/nextafter01",
// "./test-ltp.sh ltp/testcases/bin/nfs05_make_tree",
// "./test-ltp.sh ltp/testcases/bin/open01",
// "./test-ltp.sh ltp/testcases/bin/open03",
// "./test-ltp.sh ltp/testcases/bin/open04",
// "./test-ltp.sh ltp/testcases/bin/openat01",
// "./test-ltp.sh ltp/testcases/bin/pathconf01",
// "./test-ltp.sh ltp/testcases/bin/personality02",
// "./test-ltp.sh ltp/testcases/bin/pipe01",
// "./test-ltp.sh ltp/testcases/bin/pipe03",
// "./test-ltp.sh ltp/testcases/bin/pipe04",
// "./test-ltp.sh ltp/testcases/bin/pipe05",
// "./test-ltp.sh ltp/testcases/bin/pipe09",
// "./test-ltp.sh ltp/testcases/bin/pipe14",
// "./test-ltp.sh ltp/testcases/bin/poll01",
// "./test-ltp.sh ltp/testcases/bin/prctl07",
// "./test-ltp.sh ltp/testcases/bin/print_caps",
// "./test-ltp.sh ltp/testcases/bin/proc01",
// "./test-ltp.sh ltp/testcases/bin/pselect03",
// "./test-ltp.sh ltp/testcases/bin/pselect03_64",
// "./test-ltp.sh ltp/testcases/bin/read01",
// "./test-ltp.sh ltp/testcases/bin/read04",
// "./test-ltp.sh ltp/testcases/bin/readdir01",
// "./test-ltp.sh ltp/testcases/bin/readv01",
// "./test-ltp.sh ltp/testcases/bin/reboot01",
// "./test-ltp.sh ltp/testcases/bin/recvmsg02",
// "./test-ltp.sh ltp/testcases/bin/request_key01",
// "./test-ltp.sh ltp/testcases/bin/request_key05",
// "./test-ltp.sh ltp/testcases/bin/rmdir01",
// "./test-ltp.sh ltp/testcases/bin/rpc_auth_destroy",
// "./test-ltp.sh ltp/testcases/bin/rpc_authnone_create",
// "./test-ltp.sh ltp/testcases/bin/rpc_authunix_create",
// "./test-ltp.sh ltp/testcases/bin/rpc_authunix_create_default",
// "./test-ltp.sh ltp/testcases/bin/rpc_callrpc_performance",
// "./test-ltp.sh ltp/testcases/bin/rpc_callrpc_scalability",
// "./test-ltp.sh ltp/testcases/bin/rpc_callrpc_stress",
// "./test-ltp.sh ltp/testcases/bin/rpc_clnt_broadcast_performance",
// "./test-ltp.sh ltp/testcases/bin/rpc_clnt_broadcast_scalability",
// "./test-ltp.sh ltp/testcases/bin/rpc_clnt_broadcast_stress",
// "./test-ltp.sh ltp/testcases/bin/rpc_clnt_destroy_stress",
// "./test-ltp.sh ltp/testcases/bin/rpc_clntraw_create",
// "./test-ltp.sh ltp/testcases/bin/rpc_clntraw_create_performance",
// "./test-ltp.sh ltp/testcases/bin/rpc_svc_destroy",
// "./test-ltp.sh ltp/testcases/bin/rpc_svc_destroy_stress",
// "./test-ltp.sh ltp/testcases/bin/rpc_svcfd_create",
// "./test-ltp.sh ltp/testcases/bin/rpc_svcfd_create_limits",
// "./test-ltp.sh ltp/testcases/bin/rpc_svcraw_create",
// "./test-ltp.sh ltp/testcases/bin/rpc_svcraw_create_performance",
// "./test-ltp.sh ltp/testcases/bin/rpc_svctcp_create_performance",
// "./test-ltp.sh ltp/testcases/bin/rpc_svcudp_create_performance",
// "./test-ltp.sh ltp/testcases/bin/rpc_xprt_register",
// "./test-ltp.sh ltp/testcases/bin/rpc_xprt_unregister",
// "./test-ltp.sh ltp/testcases/bin/sbrk02",
// "./test-ltp.sh ltp/testcases/bin/sched_setparam01",
// "./test-ltp.sh ltp/testcases/bin/sched_yield01",
// "./test-ltp.sh ltp/testcases/bin/sendfile02",
// "./test-ltp.sh ltp/testcases/bin/sendfile02_64",
// "./test-ltp.sh ltp/testcases/bin/sendfile03",
// "./test-ltp.sh ltp/testcases/bin/sendfile03_64",
// "./test-ltp.sh ltp/testcases/bin/sendfile04",
// "./test-ltp.sh ltp/testcases/bin/sendfile04_64",
// "./test-ltp.sh ltp/testcases/bin/sendfile06",
// "./test-ltp.sh ltp/testcases/bin/sendfile06_64",
// "./test-ltp.sh ltp/testcases/bin/sendfile08",
// "./test-ltp.sh ltp/testcases/bin/sendfile08_64",
// "./test-ltp.sh ltp/testcases/bin/set_robust_list01",
// "./test-ltp.sh ltp/testcases/bin/set_tid_address01",
// "./test-ltp.sh ltp/testcases/bin/setfsuid02",
// "./test-ltp.sh ltp/testcases/bin/setgid01",
// "./test-ltp.sh ltp/testcases/bin/setgroups01",
// "./test-ltp.sh ltp/testcases/bin/setitimer02",
// "./test-ltp.sh ltp/testcases/bin/setpgid01",
// "./test-ltp.sh ltp/testcases/bin/setpgrp01",
// "./test-ltp.sh ltp/testcases/bin/setregid01",
// "./test-ltp.sh ltp/testcases/bin/setreuid01",
// "./test-ltp.sh ltp/testcases/bin/setrlimit04",
// "./test-ltp.sh ltp/testcases/bin/setsid01",
// "./test-ltp.sh ltp/testcases/bin/setsockopt03",
// "./test-ltp.sh ltp/testcases/bin/setsockopt04",
// "./test-ltp.sh ltp/testcases/bin/setuid01",
// "./test-ltp.sh ltp/testcases/bin/sigaction01",
// "./test-ltp.sh ltp/testcases/bin/sigaction02",
// "./test-ltp.sh ltp/testcases/bin/sigaltstack01",
// "./test-ltp.sh ltp/testcases/bin/signal02",
// "./test-ltp.sh ltp/testcases/bin/signal03",
// "./test-ltp.sh ltp/testcases/bin/signal04",
// "./test-ltp.sh ltp/testcases/bin/signal05",
// "./test-ltp.sh ltp/testcases/bin/time-schedule",
// "./test-ltp.sh ltp/testcases/bin/times01",
// "./test-ltp.sh ltp/testcases/bin/tkill01",
// "./test-ltp.sh ltp/testcases/bin/tkill02",
// "./test-ltp.sh ltp/testcases/bin/uname01",
// "./test-ltp.sh ltp/testcases/bin/uname02",
// "./test-ltp.sh ltp/testcases/bin/uname04",
// "./test-ltp.sh ltp/testcases/bin/wait01",
// "./test-ltp.sh ltp/testcases/bin/wait02",
// "./test-ltp.sh ltp/testcases/bin/wait402",
// "./test-ltp.sh ltp/testcases/bin/waitpid01",
// "./test-ltp.sh ltp/testcases/bin/waitpid03",
// "./test-ltp.sh ltp/testcases/bin/write06",
// "./test-ltp.sh ltp/testcases/bin/writetest",
"busybox_testcode.sh",
"lua_testcode.sh",
"netperf_testcode.sh",
Expand All @@ -259,69 +22,6 @@ const TESTCASES: &[&str] = &[
"cyclictest_testcode.sh",
"iperf_testcode.sh",
"lmbench_testcode.sh",
// "./test-ltp.sh ltp/testcases/bin/sigwait01",
// "./test-ltp.sh ltp/testcases/bin/socket02",
// "./test-ltp.sh ltp/testcases/bin/socketpair01",
// "./test-ltp.sh ltp/testcases/bin/socketpair02",
// "./test-ltp.sh ltp/testcases/bin/splice03",
// "./test-ltp.sh ltp/testcases/bin/stack_space",
// "./test-ltp.sh ltp/testcases/bin/stat02",
// "./test-ltp.sh ltp/testcases/bin/stat02_64",
// "./test-ltp.sh ltp/testcases/bin/statvfs02",
// "./test-ltp.sh ltp/testcases/bin/statx03",
// "./test-ltp.sh ltp/testcases/bin/stream01",
// "./test-ltp.sh ltp/testcases/bin/stream02",
// "./test-ltp.sh ltp/testcases/bin/stream03",
// "./test-ltp.sh ltp/testcases/bin/stream04",
// "./test-ltp.sh ltp/testcases/bin/stream05",
// "./test-ltp.sh ltp/testcases/bin/stress",
// "./test-ltp.sh ltp/testcases/bin/string01",
// "./test-ltp.sh ltp/testcases/bin/sync_file_range01",
// "./test-ltp.sh ltp/testcases/bin/syscall01",
// "./test-ltp.sh ltp/testcases/bin/sysconf01",
// "./test-ltp.sh ltp/testcases/bin/sysinfo01",
// "./test-ltp.sh ltp/testcases/bin/sysinfo02",
// "./test-ltp.sh ltp/testcases/bin/tee02",
// "./test-ltp.sh ltp/testcases/bin/page01",
// "./test-ltp.sh ltp/testcases/bin/page02",
// "./test-ltp.sh ltp/testcases/bin/getxattr01",
// "./test-ltp.sh ltp/testcases/bin/growfiles",
// "./test-ltp.sh ltp/testcases/bin/kill11",
// "./test-ltp.sh ltp/testcases/bin/ebizzy",
// "./test-ltp.sh ltp/testcases/bin/epoll_ctl03",
// "./test-ltp.sh ltp/testcases/bin/genasin",
// "./test-ltp.sh ltp/testcases/bin/genatan",
// "./test-ltp.sh ltp/testcases/bin/genatan2",
// "./test-ltp.sh ltp/testcases/bin/genceil",
// "./test-ltp.sh ltp/testcases/bin/gencos",
// "./test-ltp.sh ltp/testcases/bin/gencosh",
// "./test-ltp.sh ltp/testcases/bin/genexp",
// "./test-ltp.sh ltp/testcases/bin/genfabs",
// "./test-ltp.sh ltp/testcases/bin/genfmod",
// "./test-ltp.sh ltp/testcases/bin/genfrexp",
// "./test-ltp.sh ltp/testcases/bin/genhypot",
// "./test-ltp.sh ltp/testcases/bin/genj0",
// "./test-ltp.sh ltp/testcases/bin/genj1",
// "./test-ltp.sh ltp/testcases/bin/genldexp",
// "./test-ltp.sh ltp/testcases/bin/genlgamma",
// "./test-ltp.sh ltp/testcases/bin/genlog",
// "./test-ltp.sh ltp/testcases/bin/genmodf",
// "./test-ltp.sh ltp/testcases/bin/genpow",
// "./test-ltp.sh ltp/testcases/bin/gensin",
// "./test-ltp.sh ltp/testcases/bin/gensinh",
// "./test-ltp.sh ltp/testcases/bin/gensqrt",
// "./test-ltp.sh ltp/testcases/bin/gentan",
// "./test-ltp.sh ltp/testcases/bin/gentanh",
// "./test-ltp.sh ltp/testcases/bin/geny0",
// "./test-ltp.sh ltp/testcases/bin/getcwd04",
// "./test-ltp.sh ltp/testcases/bin/gettimeofday02",
// "./test-ltp.sh ltp/testcases/bin/ppoll01",
// "./test-ltp.sh ltp/testcases/bin/rt_sigsuspend01",
// "./test-ltp.sh ltp/testcases/bin/pidfd_open03",
// "./test-ltp.sh ltp/testcases/bin/pipe06",
// "./test-ltp.sh ltp/testcases/bin/prctl03",
// "./test-ltp.sh ltp/testcases/bin/shmdt02",
// "./test-ltp.sh ltp/testcases/bin/test_controllers.sh",
];

fn run_cmd(cmd: &str) {
Expand Down

0 comments on commit 3bac0df

Please sign in to comment.