From 3efdf98e3541de21d79fa6347bb2796c5e1363b5 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@google.com>
Date: Wed, 2 Nov 2016 16:59:37 -0400
Subject: Add a README.md with the instructions for updating the seccomp-tests
 from upstream.

Test: None. Initial commit.

Bug: 32616302
Change-Id: I0fc221531894ef8b88750dd7059a99ee5b7bc1a3
---
 README.md | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 README.md

(limited to 'README.md')

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..f6b2577
--- /dev/null
+++ b/README.md
@@ -0,0 +1,66 @@
+# Seccomp-BPF Kernel Self-Test Suite
+
+This repository contains a mirror of the upstream Linux kernel test suite for the Seccomp-BPF
+system call filter. The test suite runs as part of CTS, but it is maintained in a separate
+repository because the code is GPL.
+
+## Syncing to Upstream
+
+Rather than hold the entire Linux history in this repository, only the subdirectory for the Seccomp
+selftests are preserved here. In order to sync this repository to the upstream Linux, follow these
+instructions.
+
+### First-Time Setup
+
+These instructions only need to be followed for the first time you are updating the repository from
+a checkout.
+
+1. Configure a remote to use as the source repository (limited to only syncing the master branch):
+    ```
+    git remote add upstream-linux git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git -t master --no-tags
+    ```
+
+### Updating the Source
+
+Perform these steps every time you need to update the test suite from upstream.
+
+1. Update the remote to fetch the latest sources:
+    ```
+    git remote update upstream-linux
+    ```
+
+2. Create a new local branch from the updated source, replacing YYYYMMDD with today's date:
+    ```
+    git checkout -b update-YYYYMMDD upstream-linux/master
+    ```
+
+3. Filter the branch to just the subtree containing the Seccomp test suite:
+    ```
+    git filter-branch --subdirectory-filter tools/testing/selftests/seccomp
+    ```
+
+4. Start a new CL branch into which the updated sources will be merged:
+    ```
+    repo start sync-upstream .
+    ````
+
+5. Subtree-merge the changes into the directory. Resolve any conflicts with the local modifications
+present in the repository.
+    ```
+    git subtree merge -P linux/ update-YYYYMMDD
+    ```
+
+Now build and test the changes by running CTS:
+
+    $ mmma cts/tests/tests/os
+    $ cts-tradefed run singleCommand cts -m CtsOsTestCases -t android.os.cts.SeccompTest
+
+The tests are expected to pass on arm, arm64, x86, and x86\_64. If they pass, then repo
+upload/submit the CL branch. Afterwards, you can remove the update-YYYYMMDD branch.
+
+### Linux Space-Saving
+
+If you already have a Linux kernel checkout, you can skip adding Linux as a remote and instead
+perform steps 1-3 of "Updating the Source" in the kernel checkout. Then simply fetch the filtered
+branch into the seccomp-tests repository and subtree merge it (as FETCH\_HEAD). This will avoid
+copying the entire kernel history into your local checkout.
-- 
cgit v1.2.3