Merge branch 'bugfix'

testing/lisp/test-ob-C.el

@@ -183,4 +183,5 @@
 				 ("Friday" "friday"))
 			       (org-babel-execute-src-block))))))
 
+(provide 'test-ob-C)
 ;;; test-ob-C.el ends here

testing/lisp/test-ob-awk.el

@@ -46,3 +46,6 @@
   (org-test-at-id "9e998b2a-3581-43fe-b26d-07d3c507b86a"
     (org-babel-next-src-block 4)
     (should (equal '(("a" "b" "c")) (org-babel-execute-src-block)))))
+
+(provide 'test-ob-awk)
+;;; test-ob-awk.el ends here

testing/lisp/test-ob-sed.el

@@ -58,5 +58,5 @@
 			 (buffer-string)))))))
 
 
-
+(provide 'test-ob-sed)
 ;;; test-ob-sed ends here

testing/lisp/test-ob.el

@@ -1178,30 +1178,6 @@ echo \"test\"
       (should (re-search-forward "=\"x\"=" nil t))
       (forward-line))))
 
-(ert-deftest test-ob/commented-last-block-line-with-var ()
-  (org-test-with-temp-text-in-file "
-#+begin_src emacs-lisp :var a=1
-;;
-#+end_src"
-    (org-babel-next-src-block)
-    (org-babel-execute-maybe)
-    (re-search-forward "\\#\\+results:" nil t)
-    (forward-line)
-    (should (string=
-	     ""
-	     (buffer-substring-no-properties (point-at-bol) (point-at-eol)))))
-  (org-test-with-temp-text-in-file "
-#+begin_src emacs-lisp :var a=2
-2;;
-#+end_src"
-    (org-babel-next-src-block)
-    (org-babel-execute-maybe)
-    (re-search-forward "\\#\\+results:" nil t)
-    (forward-line)
-    (should (string=
-	     ": 2"
-	     (buffer-substring-no-properties (point-at-bol) (point-at-eol))))))
-
 (defun test-ob-verify-result-and-removed-result (result buffer-text)
   "Test helper function to test `org-babel-remove-result'.
 A temp buffer is populated with BUFFER-TEXT, the first block is executed,

testing/lisp/test-property-inheritance.el

@@ -45,6 +45,5 @@
    (org-babel-next-src-block 3)
    (should (= 6 (org-babel-execute-src-block)))))
 
-(provide 'test-ob-R)
-
+(provide 'test-property-inheritance)
 ;;; test-property-inheritance.el ends here

testing/org-test.el

@@ -373,7 +373,11 @@ setting `pp-escape-newlines' to nil manually."
 		   (condition-case err
 		       (when (string-match "^[A-Za-z].*\\.el$"
 					   (file-name-nondirectory path))
-			 (load-file path))
+                         (let ((feature-name
+                                (intern
+                                 (file-name-base
+                                  (file-name-nondirectory path)))))
+			   (require feature-name path)))
 		     (missing-test-dependency
 		      (let ((name (intern
 				   (concat "org-missing-dependency/"