Skip to content

Commit

Permalink
minor automatic whitespace fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@thestinger
thestinger committed May 7, 2013
1 parent ebe35f3 commit d800147
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions mk/install.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,9 @@ ifeq ($(CFG_ADB_DEVICE_STATUS),true)
ifdef VERBOSE
ADB = adb $(1)
ADB_PUSH = adb push $(1) $(2)
ADB_SHELL = adb shell $(1) $(2)
ADB_SHELL = adb shell $(1) $(2)
else
ADB = $(Q)$(call E, adb $(1)) && adb $(1) 1>/dev/null
ADB = $(Q)$(call E, adb $(1)) && adb $(1) 1>/dev/null
ADB_PUSH = $(Q)$(call E, adb push $(1)) && adb push $(1) $(2) 1>/dev/null
ADB_SHELL = $(Q)$(call E, adb shell $(1) $(2)) && adb shell $(1) $(2) 1>/dev/null
endif
Expand Down Expand Up @@ -222,8 +222,8 @@ install-runtime-target: \
install-runtime-target-arm-linux-androideabi-cleanup \
install-runtime-target-arm-linux-androideabi-host-$(CFG_BUILD_TRIPLE)
else
install-runtime-target:
install-runtime-target:
@echo "No device to install runtime library"
@echo
@echo
endif
endif
4 changes: 2 additions & 2 deletions mk/tests.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ endef
$(foreach target,$(CFG_TARGET_TRIPLES), \
$(eval $(call DEF_TARGET_COMMANDS,$(target))))

# Target platform specific variables
# Target platform specific variables
# for arm-linux-androidabi
define DEF_ADB_DEVICE_STATUS
CFG_ADB_DEVICE_STATUS=$(1)
Expand Down Expand Up @@ -402,7 +402,7 @@ $(foreach host,$(CFG_HOST_TRIPLES), \
$(eval $(call DEF_TEST_CRATE_RULES_null,$(stage),$(target),$(host),$(crate))) \
), \
$(eval $(call DEF_TEST_CRATE_RULES,$(stage),$(target),$(host),$(crate))) \
))))))
))))))


######################################################################
Expand Down

5 comments on commit d800147

@bors
Copy link
Contributor

@bors bors commented on d800147 May 7, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at https://github.com/thestinger/rust/commit/d800147abba010328c00e7518073085ed6ceb133

@bors
Copy link
Contributor

@bors bors commented on d800147 May 7, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging thestinger/rust/cleanup = d800147 into auto

@bors
Copy link
Contributor

@bors bors commented on d800147 May 7, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thestinger/rust/cleanup = d800147 merged ok, testing candidate = 452817b

@bors
Copy link
Contributor

@bors bors commented on d800147 May 7, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
http://buildbot.rust-lang.org/builders/auto-linux/builds/1110
http://buildbot.rust-lang.org/builders/auto-win/builds/1107
http://buildbot.rust-lang.org/builders/auto-mac/builds/1123

@bors
Copy link
Contributor

@bors bors commented on d800147 May 7, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding incoming to auto = 452817b

Please sign in to comment.