[Intel-gfx] [PATCH 11/23] piglit: Generate a Makefile.am from the sync script

Damien Lespiau damien.lespiau at intel.com
Fri Nov 15 17:33:28 CET 2013


When syncing the piglit runner, also generate the Makefile.am to include
the runner in a dist'ed tarball

Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
---
 Makefile.am             |  2 +-
 configure.ac            |  1 +
 piglit/Makefile.am      | 29 +++++++++++++++++++++++++++++
 piglit/sync-from-piglit | 20 ++++++++++++++++++++
 4 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 piglit/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f280879..0f9af6c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ SUBDIRS += debugger
 endif
 
 if BUILD_TESTS
-SUBDIRS += tests
+SUBDIRS += piglit tests
 endif
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index 0403529..18ab05d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,6 +193,7 @@ AC_CONFIG_FILES([
 		 lib/Makefile
 		 man/Makefile
 		 scripts/Makefile
+		 piglit/Makefile
 		 tests/Makefile
 		 tools/Makefile
 		 tools/quick_dump/Makefile
diff --git a/piglit/Makefile.am b/piglit/Makefile.am
new file mode 100644
index 0000000..0362786
--- /dev/null
+++ b/piglit/Makefile.am
@@ -0,0 +1,29 @@
+# This file is generated, do not edit"
+EXTRA_DIST = \
+	tests/igt.tests \
+	templates/testrun_info.mako \
+	templates/test_result.mako \
+	templates/index.mako \
+	templates/index.css \
+	templates/result.css \
+	templates/empty_status.mako \
+	piglit-merge-results.py \
+	piglit-summary.py \
+	sync-from-piglit \
+	piglit-run.py \
+	framework/status.py \
+	framework/log.py \
+	framework/patterns.py \
+	framework/junit.py \
+	framework/threads.py \
+	framework/gleantest.py \
+	framework/__init__.py \
+	framework/exectest.py \
+	framework/summary.py \
+	framework/core.py \
+	framework/threadpool.py \
+	piglit-summary-junit.py \
+	piglit-framework-tests.py \
+	piglit-print-commands.py \
+	piglit-summary-html.py \
+	$(NULL)
diff --git a/piglit/sync-from-piglit b/piglit/sync-from-piglit
index 20a95ff..b3b7bd8 100755
--- a/piglit/sync-from-piglit
+++ b/piglit/sync-from-piglit
@@ -21,4 +21,24 @@ rsync -rtv --exclude-from $EXCLUDE_FILE	\
 	$PIGLIT_DIR/piglit-*.py		\
 	$BASE_DIR
 
+files=$(cd $BASE_DIR && find .			\
+		-not -type d 			\
+		-not -name "*.pyc" 		\
+		-not -name "*.sw?" 		\
+		-not -name sync-exclude		\
+		-not -name "Makefile*" |	\
+		grep -v -e "^.$" |		\
+		sed -e 's#^\./##')
+for f in $files; do
+	FILE_LIST="\t$f \\
+$FILE_LIST"
+done
+
+cat <<EOF > $BASE_DIR/Makefile.am
+# This file is generated, do not edit"
+EXTRA_DIST = \\
+EOF
+echo -n -e "$FILE_LIST" >> $BASE_DIR/Makefile.am
+echo -e "\t\$(NULL)"  >> $BASE_DIR/Makefile.am
+
 rm -f $EXCLUDE_FILE
-- 
1.8.3.1




More information about the Intel-gfx mailing list