The method os.path.join() didn't appear to be joining the path. I did a
simple string concatenation for lack of knowing python better. I also
changed the configure line for dbt2 to use self.autodir as I couldn't
find a variable to give the deps path. Does this look okay?
From: Mark Wong <markw@osdl.org>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@273 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/tests/dbt2/dbt2.py b/tests/dbt2/dbt2.py
index 21909e3..8e75796 100644
--- a/tests/dbt2/dbt2.py
+++ b/tests/dbt2/dbt2.py
@@ -16,13 +16,14 @@
# Create symlink to autotest's results directory from dbt-2's
# preferred results directory to self.resultsdir
system('ln -s %s %s' % (self.resultsdir, \
- os.path.join(self.srcdir,'/scripts/output')))
+ self.srcdir + '/scripts/output'))
def execute(self, args = ''):
logfile = self.resultsdir + '/dbt2.log'
os.chdir(self.srcdir)
- system('./configure --with-postgresql=/usr/local/pgsql-autotest')
+ system('./configure --with-postgresql=%s/deps/pgsql/pgsql' \
+ % self.autodir)
system('make')
os.chdir(self.srcdir + '/scripts')
system('pgsql/build_db.sh -g')