[Python-modules-commits] r33571 - in packages/logilab-common/trunk/debian (changelog rules)

[morph at users.alioth.debian.org]

    Date: Saturday, August 1, 2015 @ 22:50:26
  Author: morph
Revision: 33571

* debian/rules
  - adapt test execution to new upstream code

Modified:
  packages/logilab-common/trunk/debian/changelog
  packages/logilab-common/trunk/debian/rules

Modified: packages/logilab-common/trunk/debian/changelog
===================================================================
--- packages/logilab-common/trunk/debian/changelog	2015-08-01 12:55:39 UTC (rev 33570)
+++ packages/logilab-common/trunk/debian/changelog	2015-08-01 22:50:26 UTC (rev 33571)
@@ -5,8 +5,10 @@
     - add setuptools to b-d, required by new code
   * debian/{control, copyright}
     - use HTTPS to refer to upstream website
+  * debian/rules
+    - adapt test execution to new upstream code
 
- -- Sandro Tosi <morph at debian.org>  Thu, 30 Jul 2015 01:06:12 +0100
+ -- Sandro Tosi <morph at debian.org>  Sat, 01 Aug 2015 23:50:07 +0100
 
 logilab-common (0.63.2-1) experimental; urgency=medium
 

Modified: packages/logilab-common/trunk/debian/rules
===================================================================
--- packages/logilab-common/trunk/debian/rules	2015-08-01 12:55:39 UTC (rev 33570)
+++ packages/logilab-common/trunk/debian/rules	2015-08-01 22:50:26 UTC (rev 33571)
@@ -37,24 +37,15 @@
 	# we need to "simulate" it
 	touch $(CURDIR)/$(LIB)/logilab/__init__.py
 	touch $(CURDIR)/$(LIB3)/logilab/__init__.py
-	# we need also the data subdir, so we link it (backing off the old dir first)
-	mv $(CURDIR)/$(LIB)/logilab/common/test/data $(CURDIR)/$(LIB)/logilab/common/test/data2
-	ln -s $(CURDIR)/test/data $(CURDIR)/$(LIB)/logilab/common/test/
-	mv $(CURDIR)/$(LIB3)/logilab/common/test/data $(CURDIR)/$(LIB3)/logilab/common/test/data2
-	ln -s $(CURDIR)/test/data $(CURDIR)/$(LIB3)/logilab/common/test/
 
 	# run tests
 	# use the default python version to select the script dir to run the tests
-	PYTHONPATH=$(CURDIR)/$(LIB)/ $(CURDIR)/$(SCRIPT)/pytest -t $(CURDIR)/$(LIB)/logilab/common/test
-	-PYTHONPATH=$(CURDIR)/$(LIB3)/ $(CURDIR)/$(SCRIPT3)/pytest -t $(CURDIR)/$(LIB3)//logilab/common/test
+	-PYTHONPATH=$(CURDIR)/$(LIB)/   $(CURDIR)/$(SCRIPT)/pytest  -t $(CURDIR)/test
+	-PYTHONPATH=$(CURDIR)/$(LIB3)/ $(CURDIR)/$(SCRIPT3)/pytest -t $(CURDIR)/test
 
 	# remove dummy file
 	rm -f $(CURDIR)/$(LIB)/logilab/__init__.py
 	rm -f $(CURDIR)/$(LIB3)/logilab/__init__.py
-	# and link to data dir
-	rm -f $(CURDIR)/$(LIB)/logilab/common/test/data $(CURDIR)/$(LIB3)/logilab/common/test/data
-	mv $(CURDIR)/$(LIB)/logilab/common/test/data2 $(CURDIR)/$(LIB)/logilab/common/test/data
-	mv $(CURDIR)/$(LIB3)/logilab/common/test/data2 $(CURDIR)/$(LIB3)/logilab/common/test/data
 endif
 
 override_dh_auto_clean: