commit 05a42b1d2275ed0f106a1f2b36924cca117349e0
parent 010584ff278d4f1381f76c7dd8cb09a0b9a0a401
Author: Kyle Milz <kyle@windows.krwm.net>
Date: Wed, 4 Jan 2017 17:50:15 -0800
t: remove unused use's and add win32 bits
Diffstat:
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/t/wrap_cmake.t b/t/wrap_cmake.t
@@ -4,11 +4,7 @@
use strict;
use warnings;
use File::Which;
-use Test::Cmd;
-use Test::Differences;
-use Test::More;
use t::utils;
-unified_diff;
if (which 'cmake') {
plan tests => 8;
@@ -65,12 +61,17 @@ print $wrap->stdout;
is( $wrap->stderr, '', 'is citrun_wrap cmake stderr empty');
is( $? >> 8, 0, 'is citrun_wrap cmake exit code 0');
-# Ok now run regular make.
-$wrap->run( args => 'make', chdir => $wrap->curdir );
+# Now run whatever platform specific-ish files CMake decided to give us.
+if ($^O eq "MSWin32") {
+ # MSBuild currently does not work.
+ $wrap->run( args => 'devenv /useenv program.sln /Build', chdir => $wrap->curdir );
+} else {
+ $wrap->run( args => 'make', chdir => $wrap->curdir );
+}
my $log_out;
$wrap->read( \$log_out, 'citrun.log' );
-$log_out = t::utils::clean_citrun_log($log_out);
+$log_out = clean_citrun_log($log_out);
eq_or_diff( $log_out, $log_good, 'is citrun.log identical', { context => 3 } );
print $wrap->stdout;