← Back to branch summary

~tsarev/percona-server/5.5-processlist_rows_stats-sporadic_fails-fix

« back to all changes in this revision

Viewing changes to file-contents.patch

  • Committer: Ignacio Nin
  • Date: 2011-05-24 15:46:38 UTC
  • mto: (110.6.3 atomic-fixes-5.5-staging)
  • mto: This revision was merged to the branch mainline in revision 122.
  • Revision ID: ignacio.nin@percona.com-20110524154638-2i5p27whmkndxt0d
https://launchpad.net/bugs/786289
Adapt test to our directory names (debian, redhat)

This test expected documentation to be placed in /usr/share/doc/MySQL*.
Change the path in order to follow debian and RedHat's conventions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
file-contents.patch
 
1
--- a/mysql-test/t/file_contents.test
 
2
+++ b/mysql-test/t/file_contents.test
 
3
@@ -20,7 +20,7 @@ if ($dir_bin =~ m|/usr/|) {
 
4
     $dir_docs = "$dir_docs/packages/MySQL-server";
 
5
   } else {
 
6
     # RedHat: version number in directory name
 
7
-    $dir_docs = glob "$dir_docs/MySQL-server*";
 
8
+    $dir_docs = glob "$dir_docs/Percona-Server-server*";
 
9
   }
 
10
 } elsif ($dir_bin =~ m|/usr$|) {
 
11
   # RPM build during development
 
12
@@ -28,9 +28,12 @@ if ($dir_bin =~ m|/usr/|) {
 
13
   if(-d "$dir_docs/packages/MySQL-server") {
 
14
     # SuSE
 
15
     $dir_docs = "$dir_docs/packages/MySQL-server";
 
16
+  } elsif (glob "$dir_docs/percona-server-server*") {
 
17
+    # Debian
 
18
+    $dir_docs = glob "$dir_docs/percona-server-server*";
 
19
   } else {
 
20
     # RedHat: version number in directory name
 
21
-    $dir_docs = glob "$dir_docs/MySQL-server*";
 
22
+    $dir_docs = glob "$dir_docs/Percona-Server-server*";
 
23
   }
 
24
 } else {
 
25
   # tar.gz package, Windows, or developer work (in BZR)