diff --git a/LibOS/shim/test/ltp/Makefile b/LibOS/shim/test/ltp/Makefile index 86f59b3d..f4c5532d 100644 --- a/LibOS/shim/test/ltp/Makefile +++ b/LibOS/shim/test/ltp/Makefile @@ -56,7 +56,7 @@ else $(MAKE) ltp.xml endif -%.xml: %.cfg ltp-bug-1248.cfg ltp-bug-1075.cfg $(LTPSCENARIO) $(target) +%.xml: %.cfg ltp-bug-1075.cfg $(LTPSCENARIO) $(target) ./contrib/conf_lint.py < $< ./runltp_xml.py $(RUNLTPOPTS) -c $< $(LTPSCENARIO) > $@ diff --git a/LibOS/shim/test/ltp/ltp-bug-1248.cfg b/LibOS/shim/test/ltp/ltp-bug-1248.cfg deleted file mode 100644 index cc16df73..00000000 --- a/LibOS/shim/test/ltp/ltp-bug-1248.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[getdents02] -skip = yes diff --git a/LibOS/shim/test/ltp/ltp.cfg b/LibOS/shim/test/ltp/ltp.cfg index ffdc847f..1f00a523 100644 --- a/LibOS/shim/test/ltp/ltp.cfg +++ b/LibOS/shim/test/ltp/ltp.cfg @@ -4,11 +4,6 @@ [DEFAULT] timeout = 30 - -[abort01] -must-pass = - 2 - [access01] skip = yes @@ -39,18 +34,6 @@ skip = yes [adjtimex02] skip = yes -[alarm02] -timeout = 40 - -[alarm03] -timeout = 40 - -[alarm05] -timeout = 40 - -[alarm06] -timeout = 16 - [asyncio02] timeout = 80 @@ -242,18 +225,16 @@ skip = yes [dirtyc0w] skip = yes -[dup03] -skip = yes - -[dup05] -skip = yes - +# Subtest 4 tries to unlink a file which is not readable. See +# https://github.com/oscarlab/graphene/issues/1248. [dup07] must-pass = 1 2 3 +# Subtest 4 tries to unlink a file which is not readable. See +# https://github.com/oscarlab/graphene/issues/1248. [dup202] must-pass = 1 @@ -1909,9 +1890,6 @@ skip = yes [quotactl03] skip = yes -[read01] -timeout = 40 - [read02] skip = yes @@ -2562,16 +2540,6 @@ skip = yes [setsid01] skip = yes -[setsockopt01] -must-pass = - 1 - 2 - 3 - 5 - 6 - 7 - 8 - [setsockopt02] skip = yes @@ -2897,6 +2865,7 @@ must-pass = 17 18 19 + 20 21 24 25 diff --git a/LibOS/shim/test/ltp/makevars.mk b/LibOS/shim/test/ltp/makevars.mk index 0273f7db..74b1a138 100644 --- a/LibOS/shim/test/ltp/makevars.mk +++ b/LibOS/shim/test/ltp/makevars.mk @@ -6,4 +6,4 @@ BUILDDIR = $(ROOTDIR)/build INSTALLDIR = $(ROOTDIR)/install TESTCASEDIR = $(INSTALLDIR)/testcases/bin LTPSCENARIO = $(INSTALLDIR)/runtest/syscalls -RUNLTPOPTS = -c ltp-bug-1248.cfg +RUNLTPOPTS =