From c59e08ce7d9d33f2e1a83ff3fcd49547c854604d Mon Sep 17 00:00:00 2001
From: chao-mu <chao.mu@minorcrash.com>
Date: Fri, 6 Jan 2012 21:07:16 -0500
Subject: [PATCH] Moved utility codde and expanded railgun test suite runner

---
 lib/rex/post/meterpreter/extensions/stdapi/railgun.rb.ts.rb | 2 ++
 .../meterpreter/extensions/stdapi/railgun/platform_util.rb  | 2 --
 .../extensions/stdapi/railgun/platform_util.rb.ut.rb        | 6 ++----
 .../extensions/stdapi/railgun/type/pointer_util.rb          | 2 +-
 .../extensions/stdapi/railgun/type/pointer_util.rb.ut.rb    | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun.rb.ts.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun.rb.ts.rb
index aa0e2dd539..1ea897cc0e 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun.rb.ts.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun.rb.ts.rb
@@ -5,6 +5,8 @@ require 'test/unit'
 require 'rex'
 
 require 'railgun/api_constants.rb.ut'
+require 'railgun/type/pointer_util.rb.ut'
+require 'railgun/platform_util.rb.ut'
 require 'railgun/buffer_item.rb.ut'
 require 'railgun/dll_function.rb.ut'
 require 'railgun/dll_helper.rb.ut'
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/platform_util.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/platform_util.rb
index d5dd24268d..6809873635 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/platform_util.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/platform_util.rb
@@ -4,7 +4,6 @@ module Meterpreter
 module Extensions
 module Stdapi
 module Railgun
-module Type
 module PlatformUtil
 
 	X86_64 = :x86_64
@@ -15,7 +14,6 @@ module PlatformUtil
 	end
 
 end # PlatformUtil
-end # Type
 end # Railgun
 end # Stdapi
 end # Extensions
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/platform_util.rb.ut.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/platform_util.rb.ut.rb
index af97716231..5c70016ac0 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/platform_util.rb.ut.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/platform_util.rb.ut.rb
@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-$:.unshift(File.join(File.dirname(__FILE__), '..', '..','..','..','..','..', '..', '..', 'lib')) 
+$:.unshift(File.join(File.dirname(__FILE__), '..','..','..','..','..', '..', '..', 'lib')) 
 
-require 'rex/post/meterpreter/extensions/stdapi/railgun/type/platform_util'
+require 'rex/post/meterpreter/extensions/stdapi/railgun/platform_util'
 require 'rex/post/meterpreter/extensions/stdapi/railgun/mock_magic'
 require 'test/unit'
 
@@ -12,7 +12,6 @@ module Meterpreter
 module Extensions
 module Stdapi
 module Railgun
-module Type
 class PlatformUtil::UnitTest < Test::Unit::TestCase
 	def test_parse_client_platform
 		assert_equal(PlatformUtil.parse_client_platform('x86/win32'), PlatformUtil::X86_32,
@@ -27,4 +26,3 @@ end
 end
 end
 end
-end
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/type/pointer_util.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/type/pointer_util.rb
index c6b5c9b8fc..9992316e1a 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/type/pointer_util.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/type/pointer_util.rb
@@ -1,4 +1,4 @@
-require 'rex/post/meterpreter/extensions/stdapi/railgun/type/platform_util'
+require 'rex/post/meterpreter/extensions/stdapi/railgun/platform_util'
 
 module Rex
 module Post
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/type/pointer_util.rb.ut.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/type/pointer_util.rb.ut.rb
index e5eb84c0ca..782e9afc9e 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/type/pointer_util.rb.ut.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/type/pointer_util.rb.ut.rb
@@ -3,7 +3,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..','..','..','..','..', '..', '..', 'lib')) 
 
 require 'rex/post/meterpreter/extensions/stdapi/railgun/type/pointer_util'
-require 'rex/post/meterpreter/extensions/stdapi/railgun/type/platform_util'
+require 'rex/post/meterpreter/extensions/stdapi/railgun/platform_util'
 require 'rex/post/meterpreter/extensions/stdapi/railgun/mock_magic'
 require 'test/unit'