From 2939dc8c74827b8bdd493e721fcb66f216523fa2 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Sun, 7 Jul 2013 20:01:35 -0400
Subject: [PATCH] rework the way the build tests examine the output

---
 spec/build_tests_spec.rb | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/spec/build_tests_spec.rb b/spec/build_tests_spec.rb
index 1fab96a..02415db 100644
--- a/spec/build_tests_spec.rb
+++ b/spec/build_tests_spec.rb
@@ -21,6 +21,7 @@ describe Rscons do
     FileUtils.cp_r("build_tests/#{build_test_directory}", 'build_tests_run')
     Dir.chdir("build_tests_run")
     build_testdir
+    get_build_output
   end
 
   def file_sub(fname)
@@ -34,6 +35,10 @@ describe Rscons do
     end
   end
 
+  def get_build_output
+    File.read('build.out').lines.map(&:strip)
+  end
+
   ###########################################################################
   # Tests
   ###########################################################################
@@ -45,19 +50,19 @@ describe Rscons do
   end
 
   it 'prints commands as they are executed' do
-    test_dir('simple')
-    File.read('build.out').should == <<EOF
-gcc -c -o simple.o -MMD -MF simple.mf simple.c
-gcc -o simple simple.o
-EOF
+    lines = test_dir('simple')
+    lines.should == [
+      'gcc -c -o simple.o -MMD -MF simple.mf simple.c',
+      'gcc -o simple simple.o',
+    ]
   end
 
   it 'prints short representations of the commands being executed' do
-    test_dir('header')
-    File.read('build.out').should == <<EOF
-CC header.o
-LD header
-EOF
+    lines = test_dir('header')
+    lines.should == [
+      'CC header.o',
+      'LD header',
+    ]
   end
 
   it 'builds a C program with one source file and one header file' do