build fstab before filesystems

quattor · Mar 6, 2017 · 3510c22 · 3510c22
1 parent d5382a9
commit 3510c22
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/ncm-filesystems/src/test/perl/00-load.t b/ncm-filesystems/src/test/perl/00-load.t
@@ -12,6 +12,11 @@ Basic test that ensures that our module will load correctly.
 
 use strict;
 use warnings;
+
+BEGIN {
+    unshift(@INC, '../ncm-fstab/target/lib/perl');
+}
+
 use Test::More tests => 1;
 use Test::Quattor;
 

diff --git a/ncm-filesystems/src/test/perl/configure.t b/ncm-filesystems/src/test/perl/configure.t
@@ -16,6 +16,8 @@ use Readonly;
 Readonly my $FSTAB => 'target/test/etc/fstab';
 
 BEGIN{
+    unshift(@INC, '../ncm-fstab/target/lib/perl');
+
     # This only works because the constant of NCM::Filesystem is used in a ncm-fstab sub
     use Test::Quattor;
     use NCM::Filesystem;

diff --git a/ncm-filesystems/src/test/perl/configure_create.t b/ncm-filesystems/src/test/perl/configure_create.t
@@ -12,6 +12,11 @@ Tests for adding, changing and deleting entries in /etc/fstab and mounting
 =cut
 
 use strict;
+
+BEGIN {
+    unshift(@INC, '../ncm-fstab/target/lib/perl');
+}
+
 use warnings;
 use Readonly;
 Readonly my $FSTAB => 'target/test/etc/fstab';

diff --git a/pom.xml b/pom.xml
@@ -44,7 +44,6 @@
     <module>ncm-directoryservices</module>
     <module>ncm-etcservices</module>
     <module>ncm-nagios</module>
-    <module>ncm-filesystems</module>
     <module>ncm-hostsfile</module>
     <module>ncm-ssh</module>
     <module>ncm-download</module>
@@ -68,6 +67,7 @@
     <module>ncm-mysql</module>
     <module>ncm-ldconf</module>
     <module>ncm-fstab</module>
+    <module>ncm-filesystems</module>
     <module>ncm-syslogng</module>
     <module>ncm-syslog</module>
     <module>ncm-shorewall</module>