From 4d9915573a3ebf4deb1078af0f00c060c5966f02 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Sat, 2 May 2020 12:23:55 +0200
Subject: organize top level files

Remove .gitattributes, we don't have any of these files now.
Move fuzzit.sh -> tools/fuzzit.sh.
---
 .gitattributes  |  3 ---
 .travis.yml     |  4 ++--
 fuzzit.sh       | 27 ---------------------------
 tools/fuzzit.sh | 27 +++++++++++++++++++++++++++
 4 files changed, 29 insertions(+), 32 deletions(-)
 delete mode 100644 .gitattributes
 delete mode 100755 fuzzit.sh
 create mode 100755 tools/fuzzit.sh

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index a5b1f2fb1..000000000
--- a/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-executor/defs.h     linguist-generated
-executor/syscalls.h linguist-generated
-sys/*/gen/*.go      linguist-generated
diff --git a/.travis.yml b/.travis.yml
index 2ad755523..c04cf7aa8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ jobs:
       if: branch = master AND type IN (pull_request)
       go: 1.14
       script:
-        - ./fuzzit.sh local-regression
+        - tools/fuzzit.sh local-regression
 
     - stage: fuzzit.dev (fuzzing)
       if: branch = master AND type IN (push)
@@ -48,4 +48,4 @@ jobs:
       env:
         secure: "TEXvLRUk/cmNwksHLTihVVyBWoU76EhAXkCCdLbn1FtfqCOzzMnQm02oUYcufLrVWIuVDUEUa9Tq+BrS2LGN2oTJEzk8bdQxeiztiRwbPocRLY3y3BNWWk89Vvu/eC/nPPoeRKZ7k3VZDbAk/+cPyXNMVaxBO7rwMqrne90txgTunX9V7U9Rr7b2phECBEF+riWtO3kWumZZG9qGq6NRmEcsoMOHgF2WGmxeAkAaU8xKdYOYbbUIns3cSf+bGWnFKOxSDkVDOOyKxdAc6OufejbGU4rjspty6ueXaoL69Rq5+7GOUflqLTMO8WUhpc65DPY3+9G2iH1p7U4v10Vk2V6qbQw83DDeucjSH23zIbNkjjYHSV5IMNwAMcEG5fwANfmnmQeVQCJJkwRBZufD1T+CLf9gqVldLG9qUGPI+ySli2J0oVAQ1rvMhKgR44Ipb3FQm0XBYhYXa3i08ojVXEtG8PNGHgrmOJnhUzC/BA+m9QKncxqMuISsBdlRnuU37DD0HeHZ6NTWvGy7gv2mhnCHc7AWuveBsc3XDvSfK8U3tB9LxS2OdRKWQdhnJBKowjAZ55lvTP0AgagQL+mPBQ7qJ2N8OT/oDRtN6tkY+DIEi8JTie0XOitNbY9AaF4hRFcixpesthvTEdOzx//mURXZXiPYQwyrjf9u1dwEpfA="
       script:
-        - ./fuzzit.sh fuzzing
+        - tools/fuzzit.sh fuzzing
diff --git a/fuzzit.sh b/fuzzit.sh
deleted file mode 100755
index a056397b2..000000000
--- a/fuzzit.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-# Copyright 2019 syzkaller project authors. All rights reserved.
-# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
-
-
-# Helper script for working with fuzzit.dev
-# https://github.com/fuzzitdev/example-go
-
-set -eux
-export TYPE="${1}"
-
-function target {
-	go-fuzz-build -libfuzzer -func $3 -o fuzzer.a $2
-	clang -fsanitize=fuzzer fuzzer.a -o fuzzer
-	./fuzzit create job --type "${TYPE}" --branch $TRAVIS_BRANCH --revision $TRAVIS_COMMIT syzkaller/$1 ./fuzzer
-}
-
-go get -u github.com/dvyukov/go-fuzz/go-fuzz-build
-wget -q -O fuzzit https://github.com/fuzzitdev/fuzzit/releases/download/v2.4.46/fuzzit_Linux_x86_64
-chmod a+x fuzzit
-
-make descriptions
-target syzkaller-prog-deserialize ./prog/test FuzzDeserialize
-target syzkaller-prog-parselog ./prog/test FuzzParseLog
-target syzkaller-compiler ./pkg/compiler Fuzz
-target syzkaller-report ./pkg/report Fuzz
-target syzkaller-trace2syz ./tools/syz-trace2syz/proggen Fuzz
diff --git a/tools/fuzzit.sh b/tools/fuzzit.sh
new file mode 100755
index 000000000..a056397b2
--- /dev/null
+++ b/tools/fuzzit.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+# Copyright 2019 syzkaller project authors. All rights reserved.
+# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
+
+
+# Helper script for working with fuzzit.dev
+# https://github.com/fuzzitdev/example-go
+
+set -eux
+export TYPE="${1}"
+
+function target {
+	go-fuzz-build -libfuzzer -func $3 -o fuzzer.a $2
+	clang -fsanitize=fuzzer fuzzer.a -o fuzzer
+	./fuzzit create job --type "${TYPE}" --branch $TRAVIS_BRANCH --revision $TRAVIS_COMMIT syzkaller/$1 ./fuzzer
+}
+
+go get -u github.com/dvyukov/go-fuzz/go-fuzz-build
+wget -q -O fuzzit https://github.com/fuzzitdev/fuzzit/releases/download/v2.4.46/fuzzit_Linux_x86_64
+chmod a+x fuzzit
+
+make descriptions
+target syzkaller-prog-deserialize ./prog/test FuzzDeserialize
+target syzkaller-prog-parselog ./prog/test FuzzParseLog
+target syzkaller-compiler ./pkg/compiler Fuzz
+target syzkaller-report ./pkg/report Fuzz
+target syzkaller-trace2syz ./tools/syz-trace2syz/proggen Fuzz
-- 
cgit mrf-deployment