FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Ubuntu > Ubuntu User

 
 
LinkBack Thread Tools
 
Old 11-10-2010, 04:57 PM
Chris Lumens
 
Default Remove the parts required to make "make tests" work.

Since we're apparently using "make unittest" instead, make sure the other
target simply doesn't work so there's no confusion. Also, add a Makefile.am
to tests/pylint so that directory is included in the distributed sources.
---
configure.ac | 1 +
tests/Makefile.am | 7 +------
tests/kickstart_test/Makefile.am | 5 -----
tests/pylint/Makefile.am | 22 ++++++++++++++++++++++
tests/regex/Makefile.am | 2 --
tests/storage_test/Makefile.am | 5 -----
tests/storage_test/devicelibs_test/Makefile.am | 9 ---------
7 files changed, 24 insertions(+), 27 deletions(-)
create mode 100644 tests/pylint/Makefile.am

diff --git a/configure.ac b/configure.ac
index 74cb092..fed259d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -290,6 +290,7 @@ AC_CONFIG_FILES([Makefile
tests/kickstart_test/Makefile
tests/storage_test/Makefile
tests/storage_test/devicelibs_test/Makefile
+ tests/pylint/Makefile
tests/regex/Makefile
pyanaconda/textw/Makefile
data/ui/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 00ee7bd..f959538 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,11 +17,6 @@
#
# Author: David Cantrell <dcantrell@redhat.com>

-SUBDIRS = mock kickstart_test storage_test regex
+SUBDIRS = mock kickstart_test storage_test regex pylint

MAINTAINERCLEANFILES = Makefile.in
-
-ANACDIR = $(top_builddir)/pyanaconda
-TESTS_ENVIRONMENT = PATH=/sbin:/usr/sbin:$$PATH PYTHONPATH=$(top_builddir)/tests:$(ANACDIR)/isys/.libs:$(ANACDIR)/isys:$(top_builddir)
-
-TESTS = fw_test.py tsort_test.py
diff --git a/tests/kickstart_test/Makefile.am b/tests/kickstart_test/Makefile.am
index 1f7ec6a..20b7a14 100644
--- a/tests/kickstart_test/Makefile.am
+++ b/tests/kickstart_test/Makefile.am
@@ -20,8 +20,3 @@
EXTRA_DIST = *.py

MAINTAINERCLEANFILES = Makefile.in
-
-ANACDIR = $(top_builddir)/pyanaconda
-TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir)/tests:$(ANACDIR)/isys/.libs:$(ANACDIR):$(top_builddir)
-
-TESTS = commands_test.py
diff --git a/tests/pylint/Makefile.am b/tests/pylint/Makefile.am
new file mode 100644
index 0000000..f934cf5
--- /dev/null
+++ b/tests/pylint/Makefile.am
@@ -0,0 +1,22 @@
+# tests/kickstart/Makefile.am for anaconda
+#
+# Copyright (C) 2010 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens@redhat.com>
+
+EXTRA_DIST = *pylint*
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/tests/regex/Makefile.am b/tests/regex/Makefile.am
index f9bb6f9..af1bd58 100644
--- a/tests/regex/Makefile.am
+++ b/tests/regex/Makefile.am
@@ -20,5 +20,3 @@
EXTRA_DIST = *.py

MAINTAINERCLEANFILES = Makefile.in
-
-TESTS = proxy.py
diff --git a/tests/storage_test/Makefile.am b/tests/storage_test/Makefile.am
index 343cfff..23565ab 100644
--- a/tests/storage_test/Makefile.am
+++ b/tests/storage_test/Makefile.am
@@ -22,8 +22,3 @@ SUBDIRS = devicelibs_test
EXTRA_DIST = *.py

MAINTAINERCLEANFILES = Makefile.in
-
-ANACDIR = $(top_builddir)/pyanaconda
-TESTS_ENVIRONMENT = PATH=/sbin:/usr/sbin:$$PATH PYTHONPATH=$(top_builddir)/tests:$(ANACDIR)/isys/.libs:$(ANACDIR):$(top_builddir)
-
-TESTS = action_test.py size_test.py
diff --git a/tests/storage_test/devicelibs_test/Makefile.am b/tests/storage_test/devicelibs_test/Makefile.am
index c0fce10..eeeabbd 100644
--- a/tests/storage_test/devicelibs_test/Makefile.am
+++ b/tests/storage_test/devicelibs_test/Makefile.am
@@ -20,12 +20,3 @@
EXTRA_DIST = *.py

MAINTAINERCLEANFILES = Makefile.in
-
-ANACDIR = $(top_builddir)/pyanaconda
-TESTS_ENVIRONMENT = PATH=/sbin:/usr/sbin:$$PATH PYTHONPATH=$(top_builddir)/tests:$(ANACDIR)/isys/.libs:$(ANACDIR):$(top_builddir)
-
-TESTS = crypto_test.py
- lvm_test.py
- mdraid_test.py
- mpath_test.py
- swap_test.py
--
1.7.1.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 

Thread Tools




All times are GMT. The time now is 06:00 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org