Merge pull request #443 from redis/issue-439/use-absolute-paths-for-redis-config-directives

test-config: dynamically build test.conf to provide absolute paths

Author: djanowski

.gitignore

@@ -13,3 +13,4 @@ Gemfile.lock
 /rdsrv
 /redis/*
 /test/db
+/test/test.conf

Rakefile

@@ -4,7 +4,10 @@ ENV["REDIS_BRANCH"] ||= "unstable"
 
 REDIS_DIR = File.expand_path(File.join("..", "test"), __FILE__)
 REDIS_CNF = File.join(REDIS_DIR, "test.conf")
+REDIS_CNF_TEMPLATE = File.join(REDIS_DIR, "test.conf.erb")
 REDIS_PID = File.join(REDIS_DIR, "db", "redis.pid")
+REDIS_LOG = File.join(REDIS_DIR, "db", "redis.log")
+REDIS_SOCKET = File.join(REDIS_DIR, "db", "redis.sock")
 BINARY = "tmp/redis-#{ENV["REDIS_BRANCH"]}/src/redis-server"
 
 task :default => :run
@@ -13,7 +16,7 @@ desc "Run tests and manage server start/stop"
 task :run => [:start, :test, :stop]
 
 desc "Start the Redis server"
-task :start => BINARY do
+task :start => [BINARY, REDIS_CNF] do
   sh "#{BINARY} --version"
 
   redis_running = \
@@ -46,6 +49,7 @@ end
 desc "Clean up testing artifacts"
 task :clean do
   FileUtils.rm_f(BINARY)
+  FileUtils.rm_f(REDIS_CNF)
 end
 
 file BINARY do
@@ -62,6 +66,21 @@ file BINARY do
   SH
 end
 
+file REDIS_CNF => [REDIS_CNF_TEMPLATE, __FILE__] do |t|
+  require 'erb'
+
+  erb = t.prerequisites[0]
+  template = File.read(erb)
+
+  File.open(REDIS_CNF, 'w') do |file|
+    file.puts "\# This file was auto-generated at #{Time.now}",
+              "\# from (#{erb})",
+              "\#"
+    conf = ERB.new(template).result
+    file << conf
+  end
+end
+
 Rake::TestTask.new do |t|
   t.options = "-v" if $VERBOSE
   t.test_files = FileList["test/*_test.rb"]

test/test.conf

@@ -0,0 +1,9 @@
+dir <%=        REDIS_DIR %>
+pidfile <%=    REDIS_PID %>
+port 6381
+unixsocket <%= REDIS_SOCKET %>
+timeout 300
+loglevel debug
+logfile <%=    REDIS_LOG %>
+databases 16
+daemonize yes