Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Unified Diff: tools/fiddle/fiddle_test

Issue 2138153002: tools/fiddle: remove unused fiddler.go (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/fiddle/fiddler.go » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/fiddle/fiddle_test
diff --git a/tools/fiddle/fiddle_test b/tools/fiddle/fiddle_test
index 2b5349583f4e6237728ab3f62d4f02679d459d22..19d97a9fda6fdd9bd2cc761c62b9182baf5f5331 100755
--- a/tools/fiddle/fiddle_test
+++ b/tools/fiddle/fiddle_test
@@ -18,18 +18,31 @@ if ! command -v cmake > /dev/null 2>&1 ; then
cores=32
echo "Bootstrapping CMake"
cmake_dir="${skia_dir}/third_party/externals/cmake"
- cd "$cmake_dir"
- ./bootstrap --parallel=$cores
- make -j $cores cmake
+ (
+ cd "$cmake_dir"
+ ./bootstrap --parallel=$cores
+ make -j $cores cmake
+ )
export PATH="${cmake_dir}/bin:${PATH}"
fi
echo "Building Skia and Fiddle"
+(
+ cd "${skia_dir}/cmake"
+ cmake -G Ninja .
+ ninja skia
+)
+
+tmp=$(mktemp -d "${TMPDIR:-/tmp}/fiddle_test.XXXXXXXXXX")
+
cd "$fiddle_dir"
-git clean -fxd .
-go build fiddler.go
-./fiddler "$skia_dir"
-./fiddler "$skia_dir" draw.cpp > /dev/null
-echo "cleaning up"
-git clean -fxd .
+${CXX:-c++} \
+ "@../../cmake/skia_compile_arguments.txt" \
+ -o "${tmp}/fiddle" \
+ "fiddle_main.cpp" \
+ "draw.cpp" \
+ -lOSMesa \
+ "@../../cmake/skia_link_arguments.txt"
+
+"${tmp}/fiddle" | sha1sum
« no previous file with comments | « no previous file | tools/fiddle/fiddler.go » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698