Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/skip-syscalls-sub-test-313 into ~canonical-kernel-team/+git/autotest-client-tests:master

[Po-Hsu Lin]

The fanotify07 and setsockopt09 cannot finish properly on Trusty 3.13
Mark them as failed directly to keep it going.

[Francis Ginther (fginther)]

+1

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed, thanks!

diff --git a/ubuntu_ltp_syscalls/ubuntu_ltp_syscalls.py b/ubuntu_ltp_syscalls/ubuntu_ltp_syscalls.py
index 624da58..ed1457d 100644
--- a/ubuntu_ltp_syscalls/ubuntu_ltp_syscalls.py
+++ b/ubuntu_ltp_syscalls/ubuntu_ltp_syscalls.py
@@ -139,8 +139,10 @@ class ubuntu_ltp_syscalls(test.test):
         elif test_name == 'ioctl_sg01':
             print("Set timeout multiplier LTP_TIMEOUT_MUL>1 (lp:1895281, lp:1936886) for ioctl_sg01")
             os.environ["LTP_TIMEOUT_MUL"] = LTP_TIMEOUT_MUL
-        elif test_name == 'fanotify07' and self.kernel == '4.4.0':
+        elif test_name == 'fanotify07' and self.kernel in ['3.13.0', '4.4.0']:
             raise error.TestError("fanotify07 (lp:1775165) won't fix on T/X and blocking test to finish properly (lp:1944545), mark it as failed directly")
+        elif test_name == 'setsockopt09' and self.kernel in ['3.13.0']:
+            raise error.TestError("setsockopt09 (lp:2033018) won't fix on ESM kernel, blocking test to finish properly, mark it as failed directly")
 
         # Stop timesyncd when testing time change
         if self.should_stop_timesyncd(test_name, 'stop'):